From 65a5a42c16c16582048cf77cb3692a227a3b532e Mon Sep 17 00:00:00 2001 From: Denis Merigoux Date: Tue, 8 Mar 2022 14:49:11 +0100 Subject: [PATCH] Change settings --- .ocamlformat | 5 +++-- CONTRIBUTING.md | 2 +- catala.opam | 2 +- dune-project | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.ocamlformat b/.ocamlformat index cf8f21af..484d5d0d 100644 --- a/.ocamlformat +++ b/.ocamlformat @@ -1,6 +1,7 @@ profile = default -margin = 100 +margin = 80 exp-grouping = preserve +break-fun-decl = smart wrap-comments parse-docstrings -version=0.19.0 +version=0.20.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f56ebf0d..d5fd3af5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -89,7 +89,7 @@ You can look at the [online OCaml documentation](https://catala-lang.org/ocaml_docs/) for the different modules' interfaces as well as high-level architecture documentation. -Please note that the `ocamlformat` version this project uses is `0.19.0`. +Please note that the `ocamlformat` version this project uses is `0.20.1`. Using another version may cause spurious diffs to appear in your pull requests. ### Example: adding a builtin function diff --git a/catala.opam b/catala.opam index 9e1f1152..bcb16cf0 100644 --- a/catala.opam +++ b/catala.opam @@ -40,7 +40,7 @@ depends: [ "cppo" {>= "1"} "obelisk" {dev} "alcotest" {with-test & >= "1.5.0"} - "ocamlformat" {dev & = "0.19.0"} + "ocamlformat" {dev & = "0.20.1"} "odoc" {with-doc} ] build: [ diff --git a/dune-project b/dune-project index 5c01f455..4facb1cb 100644 --- a/dune-project +++ b/dune-project @@ -80,7 +80,7 @@ (ocamlformat (and :dev - (= 0.19.0))))) + (= 0.20.1))))) (package (name french_law)