Skip to content

Commit fa5e283

Browse files
authored
bump dune version to 3, remove unused settings (#2817)
* bump dune version to 3, remove unused settings * wip
1 parent bbc5119 commit fa5e283

File tree

6 files changed

+8
-19
lines changed

6 files changed

+8
-19
lines changed

dune-project

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(lang dune 2.9)
1+
(lang dune 3.8)
22

33
(name reason)
44

reason.opam

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ license: "MIT"
1515
homepage: "https://reasonml.github.io/"
1616
bug-reports: "https://github.com/reasonml/reason/issues"
1717
depends: [
18-
"dune" {>= "2.9"}
18+
"dune" {>= "3.8"}
1919
"ocaml" {>= "4.06" & < "5.4"}
2020
"ocamlfind" {build}
2121
"dune-build-info" {>= "2.9.3"}
@@ -36,11 +36,9 @@ build: [
3636
name
3737
"-j"
3838
jobs
39-
"--promote-install-files=false"
4039
"@install"
4140
"@runtest" {with-test}
4241
"@doc" {with-doc}
4342
]
44-
["dune" "install" "-p" name "--create-install-files" name]
4543
]
4644
dev-repo: "git+https://github.com/reasonml/reason.git"

rtop.opam

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ license: "MIT"
1313
homepage: "https://reasonml.github.io/"
1414
bug-reports: "https://github.com/reasonml/reason/issues"
1515
depends: [
16-
"dune" {>= "2.9"}
16+
"dune" {>= "3.8"}
1717
"ocaml" {>= "4.06" & < "5.4"}
1818
"reason" {= version}
1919
"utop" {>= "2.0"}
@@ -29,11 +29,9 @@ build: [
2929
name
3030
"-j"
3131
jobs
32-
"--promote-install-files=false"
3332
"@install"
3433
"@runtest" {with-test}
3534
"@doc" {with-doc}
3635
]
37-
["dune" "install" "-p" name "--create-install-files" name]
3836
]
3937
dev-repo: "git+https://github.com/reasonml/reason.git"

src/menhir-recover/dune

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
(executable
22
(name main)
3-
(libraries fix menhirLib menhirSdk))
3+
(libraries fix menhirLib menhirSdk)
4+
(flags :standard -w -67))

src/reason-parser/dune

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
(public_name reason)
6666
(wrapped false)
6767
(flags
68-
(:standard -w -9-52 -safe-string))
68+
(:standard -w -9-52-67 -safe-string))
6969
(modules
7070
ocaml_util
7171
reason_syntax_util

src/reason-parser/reason_pprint_ast.ml

+2-10
Original file line numberDiff line numberDiff line change
@@ -794,17 +794,11 @@ type funcApplicationLabelStyle =
794794
| WrapFinalListyItemIfFewerThan of int
795795

796796
type formatSettings =
797-
{ (* Whether or not to expect that the original parser that generated the AST
798-
would have annotated constructor argument tuples with explicit arity to
799-
indicate that they are multiple arguments. (True if parsed in original
800-
OCaml AST, false if using Reason parser). *)
801-
constructorTupleImplicitArity : bool
802-
; space : int
797+
{ space : int
803798
; (* For curried arguments in function *definitions* only: Number of [space]s
804799
to offset beyond the [let] keyword. Default 1. *)
805800
listsRecordsIndent : int
806801
; indentWrappedPatternArgs : int
807-
; indentMatchCases : int
808802
; (* Amount to indent in label-like constructs such as wrapped function
809803
applications, etc - or even record fields. This is not the same concept
810804
as an indented curried argument list. *)
@@ -867,11 +861,9 @@ type formatSettings =
867861
}
868862

869863
let defaultSettings =
870-
{ constructorTupleImplicitArity = false
871-
; space = 1
864+
{ space = 1
872865
; listsRecordsIndent = 2
873866
; indentWrappedPatternArgs = 2
874-
; indentMatchCases = 2
875867
; indentAfterLabels = 2
876868
; trySwitchIndent = 0
877869
; funcApplicationLabelStyle = WrapFinalListyItemIfFewerThan 3

0 commit comments

Comments
 (0)