[messages] Improve warning message

I found the old message confusing.

Signed-off-by: Emilio Jesus Gallego Arias <[email protected]>

src/dune_rules/warning_emit.ml

@@ -19,9 +19,8 @@ let check_project warning project =
 let emit_hint warning =
   [ Pp.concat
       ~sep:Pp.space
-      [ Pp.text
-          "To disable this warning, add the following to your dune-project file:"
-      ; Pp.verbatim (sprintf "(%s disabled)" (Warning.name warning))
+      [ Pp.text "To disable this warning, add the following to your dune-project file:"
+      ; Pp.verbatim (sprintf "(warnings (%s disabled))" (Warning.name warning))
       ]
   ]
 ;;

test/blackbox-tests/test-cases/coq/base-unsound.t/run.t

@@ -1,8 +1,8 @@
   $ dune build --display short --profile unsound --debug-dependency-path @all
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
         coqdep .basic.theory.d
           coqc foo.{glob,vo}
           coqc bar.{glob,vo}

test/blackbox-tests/test-cases/coq/base.t/run.t

@@ -1,17 +1,17 @@
   $ dune build --display short --debug-dependency-path @all --always-show-command-line
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
         coqdep .basic.theory.d
           coqc foo.{glob,vo}
           coqc bar.{glob,vo}
 
   $ dune build --debug-dependency-path @default
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   lib: [
     "_build/install/default/lib/base/META"
     "_build/install/default/lib/base/dune-package"

test/blackbox-tests/test-cases/coq/compose-boot-nodeps.t/run.t

@@ -3,8 +3,8 @@ Testing composition with two boot libraries
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   File "A/dune", line 4, characters 11-12:
   4 |  (theories B)
                  ^

test/blackbox-tests/test-cases/coq/compose-boot-nodups.t/run.t

@@ -3,8 +3,8 @@ Testing composition with two boot libraries
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Error: Cannot have more than one boot theory in scope:
   - B at B/dune:1
   - A at A/dune:1

test/blackbox-tests/test-cases/coq/compose-boot-nostdlib.t/run.t

@@ -6,8 +6,8 @@ Composing library A depending on Coq but having `(stdlib no)`:
   $ dune build A
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Module
   Prelude
   := Struct Inductive BootType : Set :=  boot : BootType | type : BootType. End
@@ -20,8 +20,8 @@ Composing library B depending on Coq but having `(stdlib yes)`:
   $ dune build B
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Module
   Prelude
   := Struct Inductive BootType : Set :=  boot : BootType | type : BootType. End

test/blackbox-tests/test-cases/coq/compose-boot-plugins.t/run.t

@@ -3,7 +3,7 @@ Testing composition with a boot library with plugins
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   plugin loaded
   plugin loaded

test/blackbox-tests/test-cases/coq/compose-cycle.t/run.t

@@ -2,8 +2,8 @@ We check cycles are detected
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Error: Dependency cycle between:
      theory A in A/dune:2
   -> theory B in B/dune:2

test/blackbox-tests/test-cases/coq/compose-installed-compat.t/run.t

@@ -32,14 +32,14 @@ so this also tests that it won't be a problem.
   Entering directory 'B'
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Leaving directory 'B'
   $ dune install --root B --prefix=$PWD --display=short
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Installing $TESTCASE_ROOT/lib/B/META
   Installing $TESTCASE_ROOT/lib/B/dune-package
   Installing $TESTCASE_ROOT/lib/coq/user-contrib/B/.coq-native/NB_b.cmi

test/blackbox-tests/test-cases/coq/compose-plugin.t/run.t

@@ -1,8 +1,8 @@
   $ dune build --display short --debug-dependency-path @all
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
         ocamlc src_b/.ml_plugin_b.objs/byte/ml_plugin_b.{cmi,cmo,cmt}
       ocamldep src_b/.ml_plugin_b.objs/ml_plugin_b__Simple_b.impl.d
         ocamlc src_a/.ml_plugin_a.objs/byte/ml_plugin_a.{cmi,cmo,cmt}

test/blackbox-tests/test-cases/coq/compose-private-ambiguous.t/run.t

@@ -5,17 +5,17 @@ B will pick up the private one:
   $ dune build B
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   message = "I am the the private A "
        : string
 
 C picks up the private one too:
   $ dune build C
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   File "C/dune", line 4, characters 11-12:
   4 |  (theories A))
                  ^

test/blackbox-tests/test-cases/coq/compose-private.t/run.t

@@ -5,8 +5,8 @@ because a public theory cannot depend on a private theory.
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Hello
        : Set
   File "C/dune", line 4, characters 11-12:

test/blackbox-tests/test-cases/coq/compose-projects-boot.t/run.t

@@ -10,8 +10,8 @@ coqdep and coqc.
   $ dune build A
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Module
   Prelude
   := Struct Inductive BootType : Set :=  boot : BootType | type : BootType. End
@@ -32,8 +32,8 @@ private boot library will be loaded implicitly.
   $ dune build B
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   private_boot
        : PrivateBootType
 
@@ -55,8 +55,8 @@ to fix this currently.
   $ dune build B
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Error: Cannot have more than one boot theory in scope:
   - Coq at Coq/dune:1
   - Coq at B/Coq/dune:2

test/blackbox-tests/test-cases/coq/compose-projects-cycle.t/run.t

@@ -4,8 +4,8 @@ dependencies.
   $ dune build A
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Error: Dependency cycle between:
      theory A in A/dune:2
   -> theory B in B/dune:2
@@ -19,8 +19,8 @@ dependencies.
   $ dune build B
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Error: Dependency cycle between:
      theory B in B/dune:2
   -> theory C in C/dune:2
@@ -34,8 +34,8 @@ dependencies.
   $ dune build C
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Error: Dependency cycle between:
      theory C in C/dune:2
   -> theory A in A/dune:2

test/blackbox-tests/test-cases/coq/compose-projects-missing.t/run.t

@@ -4,8 +4,8 @@ dependency.
   $ dune build C
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   File "B/dune", line 4, characters 11-12:
   4 |  (theories A))
                  ^

test/blackbox-tests/test-cases/coq/compose-projects-private-ambiguous.t/run.t

@@ -11,8 +11,8 @@ which complains.
   $ dune build B
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   *** Warning: in file b.v, library a is required from root A and has not been found in the loadpath!
   File "./B/b.v", line 2, characters 0-24:
   Error: Cannot find a physical path bound to logical path a with prefix A.
@@ -22,8 +22,8 @@ which complains.
   $ dune build C
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   *** Warning: in file c.v, library a is required from root A and has not been found in the loadpath!
   *** Warning: in file a.v, library A is required from root C and has not been found in the loadpath!
   File "./C/c.v", line 2, characters 0-24:
@@ -45,14 +45,14 @@ which complains.
   $ dune build A
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
 
   $ dune build C/A_vendored
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   File "C/A_vendored/dune", line 1, characters 0-36:
   1 | (coq.theory
   2 |  (name A)

test/blackbox-tests/test-cases/coq/compose-projects.t/run.t

@@ -2,8 +2,8 @@ Testing composition of theories across a dune workspace
   $ dune build B
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Hello
        : Set
 

test/blackbox-tests/test-cases/coq/compose-self.t/run.t

@@ -2,8 +2,8 @@ Composing a theory with itself should cause a cycle
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   Error: Dependency cycle between:
      theory A in A/dune:2
   -> required by _build/default/A/.A.theory.d

test/blackbox-tests/test-cases/coq/compose-simple.t/run.t

@@ -4,8 +4,8 @@ depends on A.
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
 
 We inspect the contents of the build directory.
 

test/blackbox-tests/test-cases/coq/compose-sub-theory.t/run.t

@@ -4,8 +4,8 @@ defined as Foo.A. This changes the install layout of A.
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
 
 Inspecting the build and install directory
   $ ls _build/install/default/lib/coq/user-contrib/Foo/A/a.vo

test/blackbox-tests/test-cases/coq/compose-two-scopes.t/run.t

@@ -2,8 +2,8 @@
   $ dune build
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   lib: [
     "_build/install/default/lib/cvendor/META"
     "_build/install/default/lib/cvendor/dune-package"

test/blackbox-tests/test-cases/coq/coqdep-on-rebuild.t/run.t

@@ -16,8 +16,8 @@
   $ dune build --display short --debug-dependency-path
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
         coqdep a/.a.theory.d
         coqdep b/.b.theory.d
           coqc a/Na_a.{cmi,cmxs},a/a.{glob,vo}
@@ -31,7 +31,7 @@
   $ dune build --display short --debug-dependency-path
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
         coqdep b/.b.theory.d
           coqc b/Nb_b.{cmi,cmxs},b/b.{glob,vo}

test/blackbox-tests/test-cases/coq/coqdoc-dir-target-clash.t/run.t

@@ -3,8 +3,8 @@ directory targets. Notice how the tex one fails before html one.
   $ dune build @check
   Warning: Coq Language Versions lower than 0.8 have been deprecated in Dune
   3.8 and will be removed in an upcoming Dune version.
-  Hint: To disable this warning, add the following to your dune-project file
-  (warnings ...) section: (deprecated_coq_lang_lt_08 disabled)
+  Hint: To disable this warning, add the following to your dune-project file:
+  (warnings (deprecated_coq_lang_lt_08 disabled))
   File "dune", line 9, characters 0-116:
    9 | (rule
   10 |  (targets