Skip to content
Snippets Groups Projects
Commit 5d696acb authored by Ralf Jung's avatar Ralf Jung
Browse files

Merge branch 'robbert/curry' into 'master'

Remove curry/uncurry workaround for Coq ≤ 8.13.

See merge request !446
parents d0cfa8a5 c8078a49
No related branches found
No related tags found
1 merge request!446Remove curry/uncurry workaround for Coq ≤ 8.13.
Pipeline #77789 passed
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
-arg -w -arg -deprecated-hint-rewrite-without-locality -arg -w -arg -deprecated-hint-rewrite-without-locality
# Fixing this one requires Coq 8.15. # Fixing this one requires Coq 8.15.
-arg -w -arg -deprecated-typeclasses-transparency-without-locality -arg -w -arg -deprecated-typeclasses-transparency-without-locality
# Fixing this one requires Coq 8.13.
-arg -w -arg -deprecated-syntactic-definition
stdpp/options.v stdpp/options.v
stdpp/base.v stdpp/base.v
......
...@@ -713,12 +713,7 @@ Global Instance: Params (@pair) 2 := {}. ...@@ -713,12 +713,7 @@ Global Instance: Params (@pair) 2 := {}.
Global Instance: Params (@fst) 2 := {}. Global Instance: Params (@fst) 2 := {}.
Global Instance: Params (@snd) 2 := {}. Global Instance: Params (@snd) 2 := {}.
(** The Coq standard library swapped the names of curry/uncurry, see
https://github.com/coq/coq/pull/12716/
FIXME: Remove this workaround once the lowest Coq version we support is 8.13. *)
Notation curry := prod_uncurry.
Global Instance: Params (@curry) 3 := {}. Global Instance: Params (@curry) 3 := {}.
Notation uncurry := prod_curry.
Global Instance: Params (@uncurry) 3 := {}. Global Instance: Params (@uncurry) 3 := {}.
Definition uncurry3 {A B C D} (f : A B C D) (p : A * B * C) : D := Definition uncurry3 {A B C D} (f : A B C D) (p : A * B * C) : D :=
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment