move to dune 3.0, fix warnings

c-cube · c-cube · commit 040fe2f97cd3 · 2024-05-13T21:42:54.000-04:00
diff --git a/benchs/dune b/benchs/dune
@@ -12,7 +12,7 @@
   batteries
   base
   sek)
- (flags :standard -warn-error -3-5 -safe-string -color always)
+ (flags :standard -warn-error -3-5 -w -60 -safe-string -color always)
  (optional)
  (ocamlopt_flags
   :standard
diff --git a/benchs/run_bench_hash.ml b/benchs/run_bench_hash.ml
@@ -12,9 +12,6 @@ let random_tree =
       ~subn:[ (int 10, fun sublist -> pure mk_node <*> small_int <*> sublist) ]
       (int_range 15 150))
 
-let random_list =
-  CCRandom.(int 5 >>= fun len -> CCList.random_len len random_tree)
-
 let rec eq t1 t2 =
   match t1, t2 with
   | Empty, Empty -> true
diff --git a/benchs/run_benchs.ml b/benchs/run_benchs.ml
@@ -16,9 +16,6 @@ let app_ints f l = B.Tree.concat (List.map (app_int f) l)
 
 (* for benchmark *)
 let repeat = 3
-
-(* composition *)
-let ( %% ) f g x = f (g x)
 let opaque_ignore x = ignore (Sys.opaque_identity x)
 
 module L = struct
@@ -144,8 +141,6 @@ module L = struct
 
   (* APPEND *)
 
-  let append_ f (l1, l2, l3) = ignore (f (f l1 l2) l3)
-
   let bench_append ?(time = 2) n =
     let l1 = CCList.(1 -- n) in
     let l2 = CCList.(n + 1 -- (2 * n)) in
diff --git a/containers-data.opam b/containers-data.opam
@@ -9,7 +9,7 @@ tags: ["containers" "RAL" "function" "vector" "okasaki"]
 homepage: "https://github.com/c-cube/ocaml-containers/"
 bug-reports: "https://github.com/c-cube/ocaml-containers/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "ocaml" {>= "4.08"}
   "containers" {= version}
   "qcheck-core" {>= "0.18" & with-test}
diff --git a/containers.opam b/containers.opam
@@ -10,7 +10,7 @@ tags: ["stdlib" "containers" "iterators" "list" "heap" "queue"]
 homepage: "https://github.com/c-cube/ocaml-containers/"
 bug-reports: "https://github.com/c-cube/ocaml-containers/issues"
 depends: [
-  "dune" {>= "2.9"}
+  "dune" {>= "3.0"}
   "ocaml" {>= "4.08"}
   "either"
   "dune-configurator"
diff --git a/dune b/dune
@@ -16,3 +16,26 @@
  (locks /ctest)
  (action
   (diff README.md README.md.corrected)))
+
+(env
+ (_
+  (flags
+   :standard
+   -warn-error
+   -a+8
+   -w
+   -32-48-60-70
+   -w
+   +a-4-40-42-44-70
+   -color
+   always
+   -safe-string
+   -strict-sequence)
+  (ocamlopt_flags
+   :standard
+   -O3
+   -unbox-closures
+   -unbox-closures-factor
+   20
+   -inline
+   100)))
diff --git a/dune-project b/dune-project
@@ -1,4 +1,4 @@
-(lang dune 2.9)
+(lang dune 3.0)
 (name containers)
 (generate_opam_files true)
 
diff --git a/examples/ccparse_sexp.ml b/examples/ccparse_sexp.ml
@@ -16,8 +16,6 @@ let rec pp_sexpr out (s : sexp) : unit =
       l;
     Format.fprintf out "@])"
 
-let str_of_sexp = CCFormat.to_string pp_sexpr
-
 let skip_white_and_comments =
   fix @@ fun self ->
   skip_white
diff --git a/src/core/tests/dune b/src/core/tests/dune
@@ -1,7 +1,7 @@
 (executable
  (name check_labelled_mods)
  (modules check_labelled_mods)
- (flags :standard -warn-error -a -w -3-33-35-27-39-50 -nolabels)
+ (flags :standard -warn-error -a -w -3-33-35-27-39-50-60 -nolabels)
  (libraries containers))
 
 (executable
diff --git a/src/core/tests/test_hash.ml b/src/core/tests/test_hash.ml
@@ -10,10 +10,6 @@ module Hist = struct
 
   let create () : t = { tbl = Hashtbl.create 32; n_samples = 0 }
 
-  let add self x =
-    Hashtbl.replace self.tbl x (1 + try Hashtbl.find self.tbl x with _ -> 0);
-    self.n_samples <- 1 + self.n_samples
-
   let add_n self x n =
     Hashtbl.replace self.tbl x (n + try Hashtbl.find self.tbl x with _ -> 0);
     self.n_samples <- n + self.n_samples
diff --git a/src/dune b/src/dune
@@ -1,26 +1,3 @@
-(env
- (_
-  (flags
-   :standard
-   -warn-error
-   -a+8
-   -w
-   -32-48-70
-   -w
-   +a-4-40-42-44-70
-   -color
-   always
-   -safe-string
-   -strict-sequence)
-  (ocamlopt_flags
-   :standard
-   -O3
-   -unbox-closures
-   -unbox-closures-factor
-   20
-   -inline
-   100)))
-
 (executable
  (name mdx_runner)
  (libraries containers)
diff --git a/tests/cbor/t_appendix_a.ml b/tests/cbor/t_appendix_a.ml
@@ -6,9 +6,6 @@ module Cbor = Containers_cbor
 
 type json = Yojson.Safe.t
 
-let pp_json = J.pretty_print ~std:true
-let spf = Printf.sprintf
-
 module Test = struct
   type expect =
     | Diagnostic of string
@@ -20,14 +17,6 @@ module Test = struct
     expect: expect;
     roundtrip: bool;
   }
-
-  let pp_expect out = function
-    | Diagnostic s -> Fmt.fprintf out "(diagnostic %S)" s
-    | Decoded j -> Fmt.fprintf out "(@[decoded:@ %a@])" J.pp j
-
-  let pp out (self : t) =
-    Fmt.fprintf out "{@[hex: %S,@ expected: %a,@ roundtrip: %b@]}" self.hex
-      pp_expect self.expect self.roundtrip
 end
 
 let list_assoc_opt x l = try Some (List.assoc x l) with _ -> None
diff --git a/tests/core/dune b/tests/core/dune
@@ -1,6 +1,6 @@
 (test
  (name t)
- (flags :standard -strict-sequence -warn-error -a+8)
+ (flags :standard -strict-sequence -warn-error -a+8 -w -48-60)
  (modes
   (best exe))
  (package containers)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-(lang dune 2.9)`
	`1`	`+(lang dune 3.0)`
`2`	`2`	`(name containers)`
`3`	`3`	`(generate_opam_files true)`
`4`	`4`