diff options
| author | Pierre-Marie Pédrot | 2020-01-19 19:01:30 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2020-01-19 19:01:30 +0100 |
| commit | c4de7eb4a4e470864ecd06bb240a3f572d7d84d7 (patch) | |
| tree | cfb7df09a22fe0a6ba9e786caf00a6bb2e0ca410 | |
| parent | 3fc470fb3cab7899e372e842a21a4691812ad25a (diff) | |
| parent | e0b0aa33dcb7c39621a6598c2693a377f5d6cd43 (diff) | |
Merge PR #11398: Fix issue #11396 : Rlist hides standard list constructors cons and nil
Reviewed-by: Zimmi48
Reviewed-by: herbelin
Reviewed-by: ppedrot
| -rwxr-xr-x | dev/ci/ci-basic-overlay.sh | 7 | ||||
| -rw-r--r-- | doc/changelog/10-standard-library/11396-issue_11396_Rlist.rst | 4 | ||||
| -rw-r--r-- | theories/Reals/Ranalysis.v | 1 | ||||
| -rw-r--r-- | theories/Reals/Ranalysis_reg.v | 1 | ||||
| -rw-r--r-- | theories/Reals/RiemannInt.v | 1 | ||||
| -rw-r--r-- | theories/Reals/RiemannInt_SF.v | 1 |
6 files changed, 11 insertions, 4 deletions
diff --git a/dev/ci/ci-basic-overlay.sh b/dev/ci/ci-basic-overlay.sh index f04de0ce6c..9e9e3b4cfa 100755 --- a/dev/ci/ci-basic-overlay.sh +++ b/dev/ci/ci-basic-overlay.sh @@ -97,8 +97,11 @@ ######################################################################## # Coquelicot ######################################################################## -: "${coquelicot_CI_REF:=master}" -: "${coquelicot_CI_GITURL:=https://gitlab.inria.fr/coquelicot/coquelicot}" +# Modified until https://gitlab.inria.fr/coquelicot/coquelicot/merge_requests/2 is merged +: "${coquelicot_CI_REF:=fix-rlist-import}" +: "${coquelicot_CI_GITURL:=https://gitlab.inria.fr/pedrot/coquelicot}" +# : "${coquelicot_CI_REF:=master}" +# : "${coquelicot_CI_GITURL:=https://gitlab.inria.fr/coquelicot/coquelicot}" : "${coquelicot_CI_ARCHIVEURL:=${coquelicot_CI_GITURL}/-/archive}" ######################################################################## diff --git a/doc/changelog/10-standard-library/11396-issue_11396_Rlist.rst b/doc/changelog/10-standard-library/11396-issue_11396_Rlist.rst new file mode 100644 index 0000000000..3e1f1e02a4 --- /dev/null +++ b/doc/changelog/10-standard-library/11396-issue_11396_Rlist.rst @@ -0,0 +1,4 @@ +- **Removed:** + Export of module ``RList`` in ``Ranalysis.v`` and ``Ranalysis_reg.v``. Module ``RList`` is still there but must be imported explicitly where required. + (`#11396 <https://github.com/coq/coq/pull/11396>`_, + by Michael Soegtrop). diff --git a/theories/Reals/Ranalysis.v b/theories/Reals/Ranalysis.v index 28d1c2c97f..332d3b14e4 100644 --- a/theories/Reals/Ranalysis.v +++ b/theories/Reals/Ranalysis.v @@ -24,7 +24,6 @@ Require Export Rsqrt_def. Require Export R_sqrt. Require Export Rtrigo_calc. Require Export Rgeom. -Require Export RList. Require Export Sqrt_reg. Require Export Ranalysis4. Require Export Rpower. diff --git a/theories/Reals/Ranalysis_reg.v b/theories/Reals/Ranalysis_reg.v index cb6d57be84..e6b3f2e37b 100644 --- a/theories/Reals/Ranalysis_reg.v +++ b/theories/Reals/Ranalysis_reg.v @@ -24,7 +24,6 @@ Require Export Rsqrt_def. Require Export R_sqrt. Require Export Rtrigo_calc. Require Export Rgeom. -Require Export RList. Require Export Sqrt_reg. Require Export Ranalysis4. Require Export Rpower. diff --git a/theories/Reals/RiemannInt.v b/theories/Reals/RiemannInt.v index a848a59d48..0337b12cad 100644 --- a/theories/Reals/RiemannInt.v +++ b/theories/Reals/RiemannInt.v @@ -15,6 +15,7 @@ Require Import Ranalysis_reg. Require Import Rbase. Require Import RiemannInt_SF. Require Import Max. +Require Import RList. Local Open Scope R_scope. Set Implicit Arguments. diff --git a/theories/Reals/RiemannInt_SF.v b/theories/Reals/RiemannInt_SF.v index 6da0fe3966..c8ec4782d9 100644 --- a/theories/Reals/RiemannInt_SF.v +++ b/theories/Reals/RiemannInt_SF.v @@ -12,6 +12,7 @@ Require Import Rbase. Require Import Rfunctions. Require Import Ranalysis_reg. Require Import Classical_Prop. +Require Import RList. Local Open Scope R_scope. Set Implicit Arguments. |