aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Marie Pédrot2020-09-15 12:00:44 +0200
committerPierre-Marie Pédrot2020-09-15 12:00:44 +0200
commitd6b6e1d6ceadfe65ea398786361ff7737624deaf (patch)
treeafbdbaccda5c153130885019cc6fb5934f51ee8e
parent60960284237b295f8b82e07119e1ba1467b9a1de (diff)
parent56ff177f4bb384ed92198fd7f1c5a91aa1f099ff (diff)
Merge PR #13016: Remove deprecated Extraction Language command value "Ocaml"
Ack-by: Zimmi48 Reviewed-by: pi8027 Reviewed-by: ppedrot
-rw-r--r--doc/changelog/07-commands-and-options/13016-remove-Ocaml-value.rst4
-rw-r--r--plugins/extraction/g_extraction.mlg6
2 files changed, 4 insertions, 6 deletions
diff --git a/doc/changelog/07-commands-and-options/13016-remove-Ocaml-value.rst b/doc/changelog/07-commands-and-options/13016-remove-Ocaml-value.rst
new file mode 100644
index 0000000000..c67b0f6e80
--- /dev/null
+++ b/doc/changelog/07-commands-and-options/13016-remove-Ocaml-value.rst
@@ -0,0 +1,4 @@
+- **Removed:**
+ In the :cmd:`Extraction Language` command, remove `Ocaml` as a valid value.
+ Use `OCaml` instead. This was deprecated in Coq 8.8, `#6261 <https://github.com/coq/coq/pull/6261>`_
+ (`#13016 <https://github.com/coq/coq/pull/13016>`_, by Jim Fehrle).
diff --git a/plugins/extraction/g_extraction.mlg b/plugins/extraction/g_extraction.mlg
index 094f87f154..da7ed7be64 100644
--- a/plugins/extraction/g_extraction.mlg
+++ b/plugins/extraction/g_extraction.mlg
@@ -60,16 +60,10 @@ let pr_language = function
| Scheme -> str "Scheme"
| JSON -> str "JSON"
-let warn_deprecated_ocaml_spelling =
- CWarnings.create ~name:"deprecated-ocaml-spelling" ~category:"deprecated"
- (fun () ->
- strbrk ("The spelling \"OCaml\" should be used instead of \"Ocaml\"."))
-
}
VERNAC ARGUMENT EXTEND language
PRINTED BY { pr_language }
-| [ "Ocaml" ] -> { let _ = warn_deprecated_ocaml_spelling () in Ocaml }
| [ "OCaml" ] -> { Ocaml }
| [ "Haskell" ] -> { Haskell }
| [ "Scheme" ] -> { Scheme }