Skip to content

Commit

Permalink
[coq] Adapt to coq/coq#19310
Browse files Browse the repository at this point in the history
  • Loading branch information
proux01 authored and ejgallego committed Sep 10, 2024
1 parent 94d647e commit 2180402
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion coq/workspace.ml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ let make ~cmdline ~implicit ~kind ~debug =
in
let require_libs =
let rq_list =
if init then ((None, "Coq.Init.Prelude") :: require_libraries) @ libs
if init then ((None, "Stdlib.Init.Prelude") :: require_libraries) @ libs
else require_libraries @ libs
in
List.map mk_require_from rq_list
Expand Down
2 changes: 1 addition & 1 deletion test/CoqProject/_CoqProject
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

-arg -w -arg -local-declaration
-arg -w -arg +non-primitive-record
-arg -rifrom -arg Coq.Lists -arg List
-arg -rifrom -arg Stdlib.Lists -arg List

test.v
26 changes: 13 additions & 13 deletions test/compiler/basic/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Describe the project
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -17,7 +17,7 @@ Compile a single file, don't generate a `.vo` file:
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -33,7 +33,7 @@ Compile a single file, generate a .vo file
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -53,7 +53,7 @@ Compile a dependent file
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -73,7 +73,7 @@ Compile both files
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -94,7 +94,7 @@ Compile a dependent file without the dep being built
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand Down Expand Up @@ -131,7 +131,7 @@ Compile a file with all messages:
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -142,7 +142,7 @@ Compile a file with all messages:
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand Down Expand Up @@ -172,15 +172,15 @@ Use two workspaces
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
+ findlib default location: [TEST_PATH]
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -197,7 +197,7 @@ Load the example plugin
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -210,7 +210,7 @@ Load the astdump plugin
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand All @@ -235,7 +235,7 @@ We do the same for the goaldump plugin:
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand Down
2 changes: 1 addition & 1 deletion test/compiler/exit_code/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Describe the environment:
[message] Configuration loaded from ./_CoqProject
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 3 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand Down
2 changes: 1 addition & 1 deletion test/compiler/long_file/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ We now compile the challenging file:
[message] Configuration loaded from Command-line arguments
- coqlib is at: [TEST_PATH]
+ coqcorelib is at: [TEST_PATH]
- Modules [Coq.Init.Prelude] will be loaded by default
- Modules [Stdlib.Init.Prelude] will be loaded by default
- 2 Coq path directory bindings in scope; 27 Coq plugin directory bindings in scope
- ocamlpath wasn't overriden
+ findlib config: [TEST_PATH]
Expand Down
2 changes: 1 addition & 1 deletion test/serlib/genarg/extraction.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Require Coq.extraction.Extraction.
Require Stdlib.extraction.Extraction.

Extraction Language Haskell.

Expand Down
14 changes: 7 additions & 7 deletions test/serlib/genarg/libTactics.v
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

Set Implicit Arguments.

Require Import Coq.Lists.List.
Require Import Stdlib.Lists.List.


(* ********************************************************************** *)
Expand Down Expand Up @@ -370,7 +370,7 @@ Ltac fast_rm_inside E :=
Note: the tactic [number_to_nat] is extended in [LibInt] to
take into account the [int] type, alias for [Z]. *)

Require Coq.Numbers.BinNums Coq.ZArith.BinInt.
Require Stdlib.Numbers.BinNums Stdlib.ZArith.BinInt.

Definition ltac_int_to_nat (x:BinInt.Z) : nat :=
match x with
Expand Down Expand Up @@ -2519,7 +2519,7 @@ Tactic Notation "subst_eq" constr(E) :=
(* ---------------------------------------------------------------------- *)
(** ** Tactics to work with proof irrelevance *)

Require Import Coq.Logic.ProofIrrelevance.
Require Import Stdlib.Logic.ProofIrrelevance.

(** [pi_rewrite E] replaces [E] of type [Prop] with a fresh
unification variable, and is thus a practical way to
Expand Down Expand Up @@ -3098,7 +3098,7 @@ Tactic Notation "cases_if'" :=
[inductions E gen X1 .. XN] is a shorthand for
[dependent induction E generalizing X1 .. XN]. *)

Require Import Coq.Program.Equality.
Require Import Stdlib.Program.Equality.

Ltac inductions_post :=
unfold eq' in *.
Expand Down Expand Up @@ -3189,7 +3189,7 @@ Tactic Notation "induction_wf" ":" constr(E) ident(X) :=
judgment that includes a counter for the maximal height
(see LibTacticsDemos for an example) *)

Require Import Coq.Arith.Compare_dec.
Require Import Stdlib.Arith.Compare_dec.
Require Import Lia.

Lemma induct_height_max2 : forall n1 n2 : nat,
Expand Down Expand Up @@ -4166,7 +4166,7 @@ Tactic Notation "exists" "~" constr(T1) "," constr(T2) "," constr(T3) ","
same as for light automation.
Exception: use [subs*] instead of [subst*] if you
import the library [Coq.Classes.Equivalence]. *)
import the library [Stdlib.Classes.Equivalence]. *)

Tactic Notation "equates" "*" constr(E) :=
equates E; auto_star.
Expand Down Expand Up @@ -5007,7 +5007,7 @@ Open Scope nat_scope.

(** [exists T1 ... TN, P] is a shorthand for
[exists T1, ..., exists TN, P]. Note that
[Coq.Program.Syntax] already defines exists
[Stdlib.Program.Syntax] already defines exists
for arity up to 4. *)

Notation "'exists' x1 ',' P" :=
Expand Down
2 changes: 1 addition & 1 deletion vendor/coq
Submodule coq updated 660 files

0 comments on commit 2180402

Please sign in to comment.