Merge pull request #570 from ocaml-multicore/built-in-x-maintenance

Use dune's built-in x-maintenance support

Author: jmid

CHANGES.md

@@ -2,7 +2,7 @@
 
 ## NEXT RELEASE
 
-- ...
+- #570: Use dune.3.18 support to generate `x-maintenance-intent` entries
 
 ## 0.9
 

doc/stm/mutable_set_v0.ml

@@ -19,7 +19,7 @@ end
 
     type t = {
       mutable content  : S.t;
-      mutable cardinal : int }
+      mutable cardinal : int } [@@warning "-unused-field"]
 
     let empty () = { content = S.empty; cardinal = 0 }
 

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.0)
+(lang dune 3.18)
 (name multicoretests)
 (generate_opam_files true)
 
@@ -7,6 +7,7 @@
 (maintainers "Jan Midtgaard <[email protected]>")
 (license BSD-2-clause)
 (version "0.9")
+(maintenance_intent "(latest)")
 
 (package
  (name multicoretests)

lib/lin.ml

@@ -327,7 +327,7 @@ module type Spec = sig
   val api : (int * t elem) list
 end
 
-module MakeCmd (ApiSpec : Spec) : Internal.CmdSpec = struct
+module MakeCmd (ApiSpec : Spec) : Internal.CmdSpec with type t = ApiSpec.t = struct
 
   type t = ApiSpec.t
 

lib/lin.mli

@@ -330,7 +330,7 @@ end
 
 (** {1 Generating a linearization testing module from an API} *)
 
-module MakeCmd (Spec : Spec) : Internal.CmdSpec [@alert "-internal"]
+module MakeCmd (Spec : Spec) : Internal.CmdSpec with type t = Spec.t [@alert "-internal"]
 (** Functor to map a combinator-based module signature description
     into a raw {!Lin} description.
     This functor is exposed for internal uses only, its API may change

lib/lin_domain.mli

@@ -33,4 +33,4 @@ module Make (Spec : Spec) : sig
       raised underway. It is intended as a stress test to run operations at a
       high frequency and detect unexpected exceptions or crashes. It does not
       perform an interleaving search like {!lin_test} and {!neg_lin_test}. *)
-end
+end [@@warning "-unused-functor-parameter"]

lib/lin_effect.mli

@@ -11,6 +11,7 @@ module Make_internal (Spec : Internal.CmdSpec [@alert "-internal"]) : sig
   val neg_lin_test : count:int -> name:string -> QCheck.Test.t
 end
   [@@alert internal "This module is exposed for internal uses only, its API may change at any time"]
+  [@@warning "-unused-functor-parameter"]
 
 val fork : (unit -> unit) -> unit
 (** Helper function to fork a process in the underlying {!Stdlib.Effect}-based scheduler
@@ -36,4 +37,5 @@ module Make (Spec : Spec) : sig
       afterwards.
   *)
 end
-[@@alert experimental "This module is experimental: The interface is not considered stable, and it may fail to trigger concurrency issues that are present."]
+  [@@alert experimental "This module is experimental: The interface is not considered stable, and it may fail to trigger concurrency issues that are present."]
+  [@@warning "-unused-functor-parameter"]

lib/lin_thread.mli

@@ -44,3 +44,4 @@ module Make (Spec : Spec) : sig
       afterwards.
   *)
 end
+  [@@warning "-unused-functor-parameter"]

multicoretests.opam

@@ -20,7 +20,7 @@ tags: [
 homepage: "https://github.com/ocaml-multicore/multicoretests"
 bug-reports: "https://github.com/ocaml-multicore/multicoretests/issues"
 depends: [
-  "dune" {>= "3.0"}
+  "dune" {>= "3.18"}
   "base-domains"
   "qcheck-core" {>= "0.25"}
   "qcheck-lin" {= version}