aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2020-07-23 14:32:08 +0200
committerEmilio Jesus Gallego Arias2020-07-23 14:32:08 +0200
commit70bc0c73befa3263a92615b0c41b7d5b53297bc5 (patch)
tree1dcfa5fa51fc5924e0ed81b163f295ae51086054
parent667fac4add739479bc263f93f5c67f2c5414a865 (diff)
parentf41fccaaf30ea4f76edb8204fa5f4022467b6e0c (diff)
Merge PR #12678: Tweak the warning for arbitrary term hints.
Ack-by: SkySkimmer Reviewed-by: Zimmi48 Ack-by: ejgallego
-rw-r--r--doc/changelog/07-commands-and-options/12678-tweak-hint-constr-warning.rst6
-rw-r--r--vernac/.ocamlformat-enable1
-rw-r--r--vernac/comHints.ml6
3 files changed, 9 insertions, 4 deletions
diff --git a/doc/changelog/07-commands-and-options/12678-tweak-hint-constr-warning.rst b/doc/changelog/07-commands-and-options/12678-tweak-hint-constr-warning.rst
new file mode 100644
index 0000000000..9de072060d
--- /dev/null
+++ b/doc/changelog/07-commands-and-options/12678-tweak-hint-constr-warning.rst
@@ -0,0 +1,6 @@
+- **Changed:**
+ Arbitrary hints have been undeprecated, and their definition
+ now triggers a standard warning instead
+ (`#12678 <https://github.com/coq/coq/pull/12678>`_,
+ fixes `#11970 <https://github.com/coq/coq/issues/11970>`_,
+ by Pierre-Marie Pédrot).
diff --git a/vernac/.ocamlformat-enable b/vernac/.ocamlformat-enable
deleted file mode 100644
index ffaa7e70f4..0000000000
--- a/vernac/.ocamlformat-enable
+++ /dev/null
@@ -1 +0,0 @@
-comHints.ml
diff --git a/vernac/comHints.ml b/vernac/comHints.ml
index b05bf9a675..0e3e3c61a9 100644
--- a/vernac/comHints.ml
+++ b/vernac/comHints.ml
@@ -64,11 +64,11 @@ let project_hint ~poly pri l2r r =
(info, false, true, Hints.PathAny, Hints.IsGlobRef (Names.GlobRef.ConstRef c))
let warn_deprecated_hint_constr =
- CWarnings.create ~name:"deprecated-hint-constr" ~category:"deprecated"
+ CWarnings.create ~name:"fragile-hint-constr" ~category:"automation"
(fun () ->
Pp.strbrk
- "Declaring arbitrary terms as hints is deprecated; declare a global \
- reference instead")
+ "Declaring arbitrary terms as hints is fragile; it is recommended to \
+ declare a toplevel constant instead")
let interp_hints ~poly h =
let env = Global.env () in