From 66c523bcac8b64e202baa084bf24f5b57c61fcd6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 6 Mar 2018 16:12:28 +0000
Subject: [stdlib] Do not use “Require” inside sections
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/micromega/RingMicromega.v | 3 ++-
 plugins/nsatz/Nsatz.v             | 6 +++---
 plugins/rtauto/Rtauto.v           | 4 +---
 theories/Logic/ChoiceFacts.v      | 4 ++--
 theories/Sets/Multiset.v          | 4 +---
 theories/Sets/Uniset.v            | 4 +---
 theories/Sorting/Heap.v           | 2 +-
 7 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/plugins/micromega/RingMicromega.v b/plugins/micromega/RingMicromega.v
index 543a37ff8..f066ea462 100644
--- a/plugins/micromega/RingMicromega.v
+++ b/plugins/micromega/RingMicromega.v
@@ -21,6 +21,7 @@ Require Import List.
 Require Import Bool.
 Require Import OrderedRing.
 Require Import Refl.
+Require Coq.micromega.Tauto.
 
 Set Implicit Arguments.
 
@@ -796,7 +797,7 @@ Definition xnormalise (t:Formula C) : list (NFormula)  :=
       | OpLe => (psub lhs rhs ,Strict) :: nil
     end.
 
-Require Import Coq.micromega.Tauto.
+Import Coq.micromega.Tauto.
 
 Definition cnf_normalise (t:Formula C) : cnf (NFormula) :=
   List.map  (fun x => x::nil) (xnormalise t).
diff --git a/plugins/nsatz/Nsatz.v b/plugins/nsatz/Nsatz.v
index 85e2a5b23..c5a09d677 100644
--- a/plugins/nsatz/Nsatz.v
+++ b/plugins/nsatz/Nsatz.v
@@ -30,6 +30,7 @@ Require Export Ncring_initial.
 Require Export Ncring_tac.
 Require Export Integral_domain.
 Require Import DiscrR.
+Require Import ZArith.
 
 Declare ML Module "nsatz_plugin".
 
@@ -56,9 +57,8 @@ simpl. simpl; cring.
 Qed.
 
 (* adpatation du code de Benjamin aux setoides *)
-Require Import ZArith.
-Require Export Ring_polynom.
-Require Export InitialRing.
+Export Ring_polynom.
+Export InitialRing.
 
 Definition PolZ := Pol Z.
 Definition PEZ := PExpr Z.
diff --git a/plugins/rtauto/Rtauto.v b/plugins/rtauto/Rtauto.v
index db17c0d65..19b3ab397 100644
--- a/plugins/rtauto/Rtauto.v
+++ b/plugins/rtauto/Rtauto.v
@@ -11,7 +11,7 @@
 
 Require Export List.
 Require Export Bintree.
-Require Import Bool.
+Require Import Bool BinPos.
 
 Declare ML Module "rtauto_plugin".
 
@@ -98,8 +98,6 @@ match F with
 | F_push H hyps0 F0 =>  interp_ctx hyps0 F0  ([[H]] -> G)
 end.
 
-Require Export BinPos.
-
 Ltac wipe := intros;simpl;constructor.
 
 Lemma compose0 :
diff --git a/theories/Logic/ChoiceFacts.v b/theories/Logic/ChoiceFacts.v
index 9fd52866e..238ac7df0 100644
--- a/theories/Logic/ChoiceFacts.v
+++ b/theories/Logic/ChoiceFacts.v
@@ -28,6 +28,8 @@ intentional type theory, Journal of Symbolic Logic 70(2):488-514, 2005.
 [[Werner97]] Benjamin Werner, Sets in Types, Types in Sets, TACS, 1997.
 *)
 
+Require Import RelationClasses Logic.
+
 Set Implicit Arguments.
 Local Unset Intuition Negation Unfolding.
 
@@ -125,8 +127,6 @@ Definition DependentFunctionalRelReification_on (A:Type) (B:A -> Type) :=
    formulation of choice); Note also a typo in its intended
    formulation in [[Werner97]]. *)
 
-Require Import RelationClasses Logic.
-
 Definition RepresentativeFunctionalChoice_on :=
   forall R:A->A->Prop,
     (Equivalence R) ->
diff --git a/theories/Sets/Multiset.v b/theories/Sets/Multiset.v
index a50140628..a79ddead2 100644
--- a/theories/Sets/Multiset.v
+++ b/theories/Sets/Multiset.v
@@ -11,6 +11,7 @@
 (* G. Huet 1-9-95 *)
 
 Require Import Permut Setoid.
+Require Plus. (* comm. and ass. of plus *)
 
 Set Implicit Arguments.
 
@@ -69,9 +70,6 @@ Section multiset_defs.
     unfold meq; unfold munion; simpl; auto.
   Qed.
 
-
-  Require Plus. (* comm. and ass. of plus *)
-
   Lemma munion_comm : forall x y:multiset, meq (munion x y) (munion y x).
   Proof.
     unfold meq; unfold multiplicity; unfold munion.
diff --git a/theories/Sets/Uniset.v b/theories/Sets/Uniset.v
index 95ba93232..7940bda1a 100644
--- a/theories/Sets/Uniset.v
+++ b/theories/Sets/Uniset.v
@@ -13,7 +13,7 @@
 (* G. Huet 1-9-95 *)
 (* Updated Papageno 12/98 *)
 
-Require Import Bool.
+Require Import Bool Permut.
 
 Set Implicit Arguments.
 
@@ -140,8 +140,6 @@ Hint Resolve seq_right.
 (** Here we should make uniset an abstract datatype, by hiding [Charac],
     [union], [charac]; all further properties are proved abstractly *)
 
-Require Import Permut.
-
 Lemma union_rotate :
  forall x y z:uniset, seq (union x (union y z)) (union z (union x y)).
 Proof.
diff --git a/theories/Sorting/Heap.v b/theories/Sorting/Heap.v
index 8f583be97..d9e5ad676 100644
--- a/theories/Sorting/Heap.v
+++ b/theories/Sorting/Heap.v
@@ -136,7 +136,7 @@ Section defs.
       (munion (list_contents _ eqA_dec l1) (list_contents _ eqA_dec l2)) ->
       (forall a, HdRel leA a l1 -> HdRel leA a l2 -> HdRel leA a l) ->
       merge_lem l1 l2.
-  Require Import Morphisms.
+  Import Morphisms.
   
   Instance: Equivalence (@meq A).
   Proof. constructor; auto with datatypes. red. apply meq_trans. Defined.
-- 
cgit v1.2.3