Project upgrades

.ocamlformat

@@ -1,5 +1,5 @@
-# "Asemio Style" v1.1
-# Last updated for ocamlformat 0.19.0
+# "Asemio Style" v1.2
+# Last updated for ocamlformat 0.21.0
 
 # All available options are listed.
 # An option is commented out when the value matches the default
@@ -8,52 +8,36 @@
 # - try out new values for existing options
 # - if a default changed, see if we should follow it or not
 
-# align-cases = false
-align-constructors-decl = true
-align-variants-decl = true
 # assignment-operator = end-line
-# break-before-in = fit-or-vertical
 break-cases = all
-# break-collection-expressions = fit-or-vertical
 # break-fun-decl = wrap
 # break-fun-sig = wrap
 break-infix = fit-or-vertical
 # break-infix-before-func = false
 # break-separators = after
 # break-sequences = true
-# break-string-literals = auto
-# break-struct = force
 cases-exp-indent = 2
 # cases-matching-exp-indent = normal
-disambiguate-non-breaking-match = true
 doc-comments = before
 # doc-comments-padding = 2
 # doc-comments-tag-only = default
 # dock-collection-brackets = true
 exp-grouping = preserve
-# extension-indent = 2
 field-space = tight-decl
-function-indent = 0
-# function-indent-nested = never
 if-then-else = keyword-first
-# indent-after-in = 0
 # indicate-multiline-delimiters = no
 indicate-nested-or-patterns = space
 # infix-precedence = indent
 # leading-nested-match-parens = false
 let-and = sparse
-# let-binding-indent = 2
 # let-binding-spacing = compact
 # let-module = compact
+line-endings = lf
 margin = 106
-# match-indent = 0
-# match-indent-nested = never
 max-indent = 3
-# module-item-spacing = sparse
-# nested-match = wrap
+module-item-spacing = sparse
 parens-ite = true
 parens-tuple = multi-line-only
-# parens-tuple-patterns = multi-line-only
 # parse-docstrings = false
 # sequence-blank-line = preserve-one
 # sequence-style = terminator
@@ -62,8 +46,29 @@ single-case = sparse
 # space-around-lists = true
 # space-around-records = true
 # space-around-variants = true
-# stritem-extension-indent = 0
 type-decl = sparse
-# type-decl-indent = 2
 # wrap-comments = false
 # wrap-fun-args = true
+
+
+# DEPRECATED
+
+# align-cases = false
+align-constructors-decl = true
+align-variants-decl = true
+# break-before-in = fit-or-vertical
+# break-collection-expressions = fit-or-vertical
+# break-string-literals = auto
+# break-struct = force
+disambiguate-non-breaking-match = true
+# extension-indent = 2
+function-indent = 0
+# function-indent-nested = never
+# indent-after-in = 0
+# let-binding-indent = 2
+# match-indent = 0
+# match-indent-nested = never
+# nested-match = wrap
+# parens-tuple-patterns = multi-line-only
+# stritem-extension-indent = 0
+# type-decl-indent = 2

DEVELOPMENT.md

@@ -3,9 +3,9 @@
 ### Setup
 From the root of the repo:
 ```sh
-brew install opam libomp llvm # llvm for the linker
+brew install opam libomp mold
 
-opam switch create . ocaml-variants.4.13.1+options --no-install
+opam switch create . ocaml-variants.4.14.0+options --no-install
 opam install . --deps-only -t
 
 # Remove old Flow version

Dockerfile

@@ -1,4 +1,4 @@
-FROM asemio/mountain-caravan:2.0.0
+FROM asemio/mountain-caravan:2.0.1
 WORKDIR /app
 RUN sudo apk update \
   && sudo apk upgrade \

dune-project

@@ -1,2 +1,3 @@
-(lang dune 2.0)
+(lang dune 2.8)
 (name strings)
+(use_standard_c_and_cxx_flags true)

src/cli/link_flags.macosx.dune

@@ -1,8 +1,8 @@
-; mold (requires `mold`) Fastest but 1.3.0 does not work on this executable yet
-; (-cclib -fuse-ld=mold -cc clang++)
+; mold (requires `mold`) fastest
+(-cclib -fuse-ld=mold -cc clang++)
 
-; lld (requires `llvm`) 20% faster than the default
-(-cclib -fuse-ld=/usr/local/opt/llvm/bin/ld64.lld -cc clang++)
+; llvm lld (requires `llvm`) 20% faster than the default
+; (-cclib -fuse-ld=/usr/local/opt/llvm/bin/ld64.lld -cc clang++)
 
 ; system default
 ; ()

src/quickjs/dune

@@ -48,7 +48,7 @@
 (rule
   (targets libquickjs.a)
   (action (bash "
-    cp %{project_root}/../../quickjs/libquickjs.lto.a libquickjs.a
+    cp %{project_root}/../../quickjs/libquickjs.a libquickjs.a
   "))
   (mode standard)
 )

strings.opam

@@ -13,12 +13,12 @@ homepage: "https://github.com/okTurtles/strings"
 doc: "https://github.com/okTurtles/strings"
 bug-reports: "https://github.com/okTurtles/strings/issues"
 depends: [
-  "ocaml" { = "4.13.1" }
+  "ocaml" { = "4.14.0" }
   "ocaml-option-flambda"
-  "dune" { >= "2.6.0"}
+  "dune" { >= "2.8.0"}
 
-  "ocamlformat" { = "0.19.0" & with-test }
-  "ocamlformat-rpc" { = "0.19.0" & with-test }
+  "ocamlformat" { = "0.21.0" & with-test }
+  "ocamlformat-rpc" { = "0.21.0" & with-test }
   "ocaml-lsp-server" { with-test }
 
   "angstrom"