diff --git a/src/AbstractInterpretation/AbstractInterpretation.v b/src/AbstractInterpretation/AbstractInterpretation.v index c43ead4fc9..1a0dfcba1b 100644 --- a/src/AbstractInterpretation/AbstractInterpretation.v +++ b/src/AbstractInterpretation/AbstractInterpretation.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.ListUtil.FoldBool. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. diff --git a/src/AbstractInterpretation/Proofs.v b/src/AbstractInterpretation/Proofs.v index c245558ac4..cf906c346c 100644 --- a/src/AbstractInterpretation/Proofs.v +++ b/src/AbstractInterpretation/Proofs.v @@ -1,8 +1,8 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Classes.RelationPairs. -Require Import Coq.Relations.Relations. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. +From Coq Require Import RelationPairs. +From Coq Require Import Relations. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. Require Import Crypto.Util.ZRange.BasicLemmas. diff --git a/src/AbstractInterpretation/Wf.v b/src/AbstractInterpretation/Wf.v index fb64ae8d4c..32bacd156d 100644 --- a/src/AbstractInterpretation/Wf.v +++ b/src/AbstractInterpretation/Wf.v @@ -1,8 +1,8 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Classes.RelationPairs. -Require Import Coq.Relations.Relations. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. +From Coq Require Import RelationPairs. +From Coq Require Import Relations. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.Sum. Require Import Crypto.Util.LetIn. diff --git a/src/AbstractInterpretation/ZRange.v b/src/AbstractInterpretation/ZRange.v index 5a4b71c85e..76138633d7 100644 --- a/src/AbstractInterpretation/ZRange.v +++ b/src/AbstractInterpretation/ZRange.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import ZArith. Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.ListUtil.FoldBool. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. diff --git a/src/AbstractInterpretation/ZRangeCommonProofs.v b/src/AbstractInterpretation/ZRangeCommonProofs.v index 2fb7f87210..91ef5cdb68 100644 --- a/src/AbstractInterpretation/ZRangeCommonProofs.v +++ b/src/AbstractInterpretation/ZRangeCommonProofs.v @@ -1,6 +1,6 @@ (* Proofs shared by Wf and Proofs *) -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relations. +From Coq Require Import Morphisms. +From Coq Require Import Relations. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.Option. Require Import Crypto.Util.ListUtil. diff --git a/src/AbstractInterpretation/ZRangeProofs.v b/src/AbstractInterpretation/ZRangeProofs.v index 6b3a623d56..f9de3414ff 100644 --- a/src/AbstractInterpretation/ZRangeProofs.v +++ b/src/AbstractInterpretation/ZRangeProofs.v @@ -1,9 +1,9 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Classes.RelationPairs. -Require Import Coq.Relations.Relations. -Require Import Coq.Lists.List. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. +From Coq Require Import RelationPairs. +From Coq Require Import Relations. +From Coq Require Import List. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. Require Import Crypto.Util.ZRange.BasicLemmas. diff --git a/src/Algebra/Field.v b/src/Algebra/Field.v index 8ba0b28b9c..8607619a2b 100644 --- a/src/Algebra/Field.v +++ b/src/Algebra/Field.v @@ -1,9 +1,9 @@ Require Import Crypto.Util.Relations Crypto.Util.Notations. Require Import Crypto.Util.Tactics.UniquePose. Require Import Crypto.Util.Tactics.DebugPrint. -Require Import Coq.Classes.RelationClasses Coq.Classes.Morphisms. +From Coq Require Import RelationClasses Morphisms. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Ring Crypto.Algebra.IntegralDomain. -Require Coq.setoid_ring.Field_theory. +From Coq Require Field_theory. Section Field. Context {T eq zero one opp add mul sub inv div} `{@field T eq zero one opp add sub mul inv div}. diff --git a/src/Algebra/Field_test.v b/src/Algebra/Field_test.v index 522010d5c2..60a0df1699 100644 --- a/src/Algebra/Field_test.v +++ b/src/Algebra/Field_test.v @@ -1,4 +1,4 @@ -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinPosDef. Require Import Crypto.Util.Decidable Crypto.Util.Notations. Require Import Crypto.Algebra.Ring Crypto.Algebra.Field. diff --git a/src/Algebra/Group.v b/src/Algebra/Group.v index 605ebdd8a9..9a202b059b 100644 --- a/src/Algebra/Group.v +++ b/src/Algebra/Group.v @@ -1,4 +1,5 @@ -Require Import Coq.Classes.Morphisms Crypto.Util.Relations (*Crypto.Util.Tactics*). +From Coq Require Import Morphisms. +Require Import Crypto.Util.Relations (*Crypto.Util.Tactics*). Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Monoid. Section BasicProperties. diff --git a/src/Algebra/Hierarchy.v b/src/Algebra/Hierarchy.v index cb708de768..1b855fc146 100644 --- a/src/Algebra/Hierarchy.v +++ b/src/Algebra/Hierarchy.v @@ -1,10 +1,10 @@ Require Export Crypto.Util.FixCoqMistakes. Require Export Crypto.Util.Decidable. -Require Coq.PArith.BinPos. -Require Import Coq.Classes.Morphisms. +From Coq Require BinPos. +From Coq Require Import Morphisms. -Require Coq.Lists.List. +From Coq Require List. Local Close Scope nat_scope. Local Close Scope type_scope. Local Close Scope core_scope. diff --git a/src/Algebra/IntegralDomain.v b/src/Algebra/IntegralDomain.v index 7d334df47e..49867d77df 100644 --- a/src/Algebra/IntegralDomain.v +++ b/src/Algebra/IntegralDomain.v @@ -1,4 +1,4 @@ -Require Coq.setoid_ring.Integral_domain. +From Coq Require Integral_domain. Require Crypto.Algebra.Nsatz. Require Import Crypto.Util.Factorize. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Ring. diff --git a/src/Algebra/Monoid.v b/src/Algebra/Monoid.v index 4b9257cf99..cc912fb11f 100644 --- a/src/Algebra/Monoid.v +++ b/src/Algebra/Monoid.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Util.Tactics.RewriteHyp. Require Import Crypto.Algebra.Hierarchy. diff --git a/src/Algebra/Nsatz.v b/src/Algebra/Nsatz.v index d1bc7b205c..ec5232c895 100644 --- a/src/Algebra/Nsatz.v +++ b/src/Algebra/Nsatz.v @@ -2,8 +2,8 @@ periodically check whether we still need it -- once enough bugs get fixed in mailine, we hope to drop this implementation *) -Require Coq.nsatz.NsatzTactic. -Require Import Coq.Lists.List. +From Coq Require NsatzTactic. +From Coq Require Import List. (** For compat with https://github.com/coq/coq/pull/12073 *) Module Nsatz. @@ -50,7 +50,7 @@ Ltac nsatz_get_reified_givens reified_package := Ltac nsatz_get_reified_goal reified_package := lazymatch reified_package with (_, _, ?goal) => goal end. -Require Import Coq.setoid_ring.Ring_polynom. +From Coq Require Import Ring_polynom. (* Kludge for 8.4/8.5 compatibility *) Module Import mynsatz_compute. Import Coq.nsatz.NsatzTactic. diff --git a/src/Algebra/Ring.v b/src/Algebra/Ring.v index c9f5a3f4b4..340d1d2a83 100644 --- a/src/Algebra/Ring.v +++ b/src/Algebra/Ring.v @@ -1,13 +1,13 @@ -Require Coq.setoid_ring.Ncring. -Require Coq.setoid_ring.Cring. -Require Import Coq.Classes.Morphisms. -Require Import Coq.micromega.Lia. +From Coq Require Ncring. +From Coq Require Cring. +From Coq Require Import Morphisms. +From Coq Require Import Lia. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.OnSubterms. Require Import Crypto.Util.Tactics.Revert. Require Import Crypto.Util.Tactics.RewriteHyp. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Group Crypto.Algebra.Monoid. -Require Coq.ZArith.ZArith Coq.PArith.PArith. +From Coq Require ZArith PArith. Section Ring. @@ -451,7 +451,7 @@ Definition char_ge Existing Class char_ge. (*** Tactics for ring equations *) -Require Export Coq.setoid_ring.Ring_tac. +From Coq Require Export Ring_tac. Ltac ring_simplify_subterms := tac_on_subterms ltac:(fun t => ring_simplify t). Ltac ring_simplify_subterms_in_all := diff --git a/src/Algebra/ScalarMult.v b/src/Algebra/ScalarMult.v index c7ea7f6454..6eedf6ce78 100644 --- a/src/Algebra/ScalarMult.v +++ b/src/Algebra/ScalarMult.v @@ -1,5 +1,6 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia Crypto.Util.ZUtil.Peano. -Require Import Coq.Classes.Morphisms. +From Coq Require Import ZArith Lia. +Require Import Crypto.Util.ZUtil.Peano. +From Coq Require Import Morphisms. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Group. Local Open Scope Z_scope. diff --git a/src/Algebra/SubsetoidRing.v b/src/Algebra/SubsetoidRing.v index 6b7c7963b6..d69b621721 100644 --- a/src/Algebra/SubsetoidRing.v +++ b/src/Algebra/SubsetoidRing.v @@ -1,6 +1,6 @@ -Require Coq.setoid_ring.Ncring. -Require Coq.setoid_ring.Cring. -Require Import Coq.Classes.Morphisms. +From Coq Require Ncring. +From Coq Require Cring. +From Coq Require Import Morphisms. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.OnSubterms. Require Import Crypto.Util.Tactics.Revert. @@ -8,7 +8,7 @@ Require Import Crypto.Util.Tactics.RewriteHyp. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Group Crypto.Algebra.Monoid. Require Import Crypto.Algebra.Ring. Require Import Crypto.Util.Tactics.DestructHead. -Require Coq.ZArith.ZArith Coq.PArith.PArith. +From Coq Require ZArith PArith. Section Ring. diff --git a/src/Arithmetic/BYInv.v b/src/Arithmetic/BYInv.v index 3c016291a4..bf80c6cc62 100644 --- a/src/Arithmetic/BYInv.v +++ b/src/Arithmetic/BYInv.v @@ -1,8 +1,8 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.nsatz.Nsatz. -Require Import Coq.micromega.Lia. +From Coq Require Import Bool. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Nsatz. +From Coq Require Import Lia. Require Import Crypto.Arithmetic.UniformWeight. Require Import Crypto.Arithmetic.Saturated. Require Import Crypto.Arithmetic.Core. diff --git a/src/Arithmetic/BarrettReduction.v b/src/Arithmetic/BarrettReduction.v index fb35d6cefb..183c044e12 100644 --- a/src/Arithmetic/BarrettReduction.v +++ b/src/Arithmetic/BarrettReduction.v @@ -1,6 +1,7 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia Crypto.Algebra.Nsatz. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +Require Import Crypto.Algebra.Nsatz. +From Coq Require Import Derive. +From Coq Require Import List. Require Import Crypto.Algebra.Ring. Require Import Crypto.Arithmetic.BaseConversion. Require Import Crypto.Arithmetic.Core. diff --git a/src/Arithmetic/BarrettReduction/Generalized.v b/src/Arithmetic/BarrettReduction/Generalized.v index 875dee5025..693d98c0fb 100644 --- a/src/Arithmetic/BarrettReduction/Generalized.v +++ b/src/Arithmetic/BarrettReduction/Generalized.v @@ -8,7 +8,7 @@ ± 1] to [k ± offset]). This leads to weaker conditions on the base ([b]), exponent ([k]), and the [offset] than those given in the HAC. *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Div. Require Import Crypto.Util.ZUtil.Modulo. Require Import Crypto.Util.ZUtil.Pow. diff --git a/src/Arithmetic/BarrettReduction/HAC.v b/src/Arithmetic/BarrettReduction/HAC.v index 98fae91d78..d9ac65c7dd 100644 --- a/src/Arithmetic/BarrettReduction/HAC.v +++ b/src/Arithmetic/BarrettReduction/HAC.v @@ -8,7 +8,7 @@ does reduction modulo [b^(k+offset)] early (ensuring that we don't have to carry around extra precision), but requires more stringint conditions on the base ([b]), exponent ([k]), and the [offset]. *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.ZUtil.Tactics.ZeroBounds. diff --git a/src/Arithmetic/BarrettReduction/RidiculousFish.v b/src/Arithmetic/BarrettReduction/RidiculousFish.v index 5b708133fa..695aa4e0f1 100644 --- a/src/Arithmetic/BarrettReduction/RidiculousFish.v +++ b/src/Arithmetic/BarrettReduction/RidiculousFish.v @@ -1,8 +1,8 @@ Require Import Crypto.Util.Notations. Require Import Crypto.Util.ZUtil.Hints.ZArith. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Open Scope Z_scope. diff --git a/src/Arithmetic/BarrettReduction/Wikipedia.v b/src/Arithmetic/BarrettReduction/Wikipedia.v index d6a3874145..739788068d 100644 --- a/src/Arithmetic/BarrettReduction/Wikipedia.v +++ b/src/Arithmetic/BarrettReduction/Wikipedia.v @@ -1,6 +1,6 @@ (*** Barrett Reduction *) (** This file implements Barrett Reduction on [Z]. We follow Wikipedia. *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Tactics.ZeroBounds. Require Import Crypto.Util.ZUtil.Tactics.SimplifyFractionsLe. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. diff --git a/src/Arithmetic/BaseConversion.v b/src/Arithmetic/BaseConversion.v index 87c2da45e1..b7bb07064f 100644 --- a/src/Arithmetic/BaseConversion.v +++ b/src/Arithmetic/BaseConversion.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import Derive. +From Coq Require Import List. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. Require Import Crypto.Arithmetic.Partition. diff --git a/src/Arithmetic/BinaryExtendedGCD.v b/src/Arithmetic/BinaryExtendedGCD.v index e9d205995f..bd7434d107 100644 --- a/src/Arithmetic/BinaryExtendedGCD.v +++ b/src/Arithmetic/BinaryExtendedGCD.v @@ -1,7 +1,7 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.ZArith.Znumtheory. +From Coq Require Import Bool. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import Znumtheory. Require Import Crypto.Util.Loops. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.ZUtil. diff --git a/src/Arithmetic/Core.v b/src/Arithmetic/Core.v index b554c37fd5..ed1755cfa9 100644 --- a/src/Arithmetic/Core.v +++ b/src/Arithmetic/Core.v @@ -1,7 +1,7 @@ (* Following http://adam.chlipala.net/theses/andreser.pdf chapter 3 *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Structures.Orders. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import Orders. +From Coq Require Import List. Require Import Crypto.Algebra.Nsatz. Require Import Crypto.Arithmetic.ModularArithmeticTheorems. Require Import Crypto.Util.Decidable. diff --git a/src/Arithmetic/DettmanMultiplication.v b/src/Arithmetic/DettmanMultiplication.v index cf887c0505..439639334e 100644 --- a/src/Arithmetic/DettmanMultiplication.v +++ b/src/Arithmetic/DettmanMultiplication.v @@ -1,8 +1,8 @@ Require Import Crypto.Arithmetic.Core. -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Require Import Crypto.Arithmetic.ModOps. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. +From Coq Require Import QArith_base Qround. Local Open Scope list_scope. Import Associational Positional. diff --git a/src/Arithmetic/FLia.v b/src/Arithmetic/FLia.v index ce7c181b88..dcb775e251 100644 --- a/src/Arithmetic/FLia.v +++ b/src/Arithmetic/FLia.v @@ -1,5 +1,5 @@ -Require Import ZArith.ZArith. -Require Import Coq.micromega.Lia. +Require Import PArith BinInt ZArith. +From Coq Require Import Lia. Require Import Crypto.Arithmetic.PrimeFieldTheorems. Local Open Scope Z_scope. diff --git a/src/Arithmetic/FancyMontgomeryReduction.v b/src/Arithmetic/FancyMontgomeryReduction.v index 2e6a6d8da8..a965caa6e1 100644 --- a/src/Arithmetic/FancyMontgomeryReduction.v +++ b/src/Arithmetic/FancyMontgomeryReduction.v @@ -1,6 +1,7 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia Crypto.Algebra.Nsatz. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +Require Import Crypto.Algebra.Nsatz. +From Coq Require Import Derive. +From Coq Require Import List. Require Import Crypto.Arithmetic.BaseConversion. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. diff --git a/src/Arithmetic/Freeze.v b/src/Arithmetic/Freeze.v index fdcc7c05cc..5cef07fc55 100644 --- a/src/Arithmetic/Freeze.v +++ b/src/Arithmetic/Freeze.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil. +From Coq Require Import ZArith Lia. +Require Import QArith_base Qround Crypto.Util.QUtil. Require Import Crypto.Arithmetic.BaseConversion. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. diff --git a/src/Arithmetic/ModOps.v b/src/Arithmetic/ModOps.v index eb620961b8..7c3880b7f1 100644 --- a/src/Arithmetic/ModOps.v +++ b/src/Arithmetic/ModOps.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.derive.Derive. -Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil. +From Coq Require Import ZArith Lia. +From Coq Require Import Derive. +Require Import QArith_base Qround Crypto.Util.QUtil. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. diff --git a/src/Arithmetic/ModularArithmeticPre.v b/src/Arithmetic/ModularArithmeticPre.v index e06e6a8d39..b44a099aef 100644 --- a/src/Arithmetic/ModularArithmeticPre.v +++ b/src/Arithmetic/ModularArithmeticPre.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith Coq.NArith.NArith Coq.Numbers.BinNums Coq.ZArith.Znumtheory. -Require Import Coq.Logic.Eqdep_dec. -Require Import Coq.Logic.EqdepFacts. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith NArith BinNums Znumtheory. +From Coq Require Import Eqdep_dec. +From Coq Require Import EqdepFacts. +From Coq Require Import Lia. Require Import Crypto.Util.NumTheoryUtil. Require Export Crypto.Util.FixCoqMistakes. Require Import Crypto.Util.Tactics.BreakMatch. diff --git a/src/Arithmetic/ModularArithmeticTheorems.v b/src/Arithmetic/ModularArithmeticTheorems.v index 9d9bb6f5f7..10327a76cd 100644 --- a/src/Arithmetic/ModularArithmeticTheorems.v +++ b/src/Arithmetic/ModularArithmeticTheorems.v @@ -1,10 +1,10 @@ -Require Import Coq.micromega.Lia. +From Coq Require Import Lia. Require Import Crypto.Spec.ModularArithmetic. Require Import Crypto.Arithmetic.ModularArithmeticPre. -Require Import Coq.ZArith.ZArith Coq.ZArith.Zdiv Coq.ZArith.Znumtheory Coq.NArith.NArith. (* import Zdiv before Znumtheory *) -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Export Coq.setoid_ring.Ring_theory Coq.setoid_ring.Ring_tac. +From Coq Require Import ZArith Zdiv Znumtheory NArith NArithRing. (* import Zdiv before Znumtheory *) +From Coq Require Import Morphisms Setoid. +From Coq Require Export Ring_theory Ring_tac. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.ScalarMult. Require Crypto.Algebra.Ring Crypto.Algebra.Field. diff --git a/src/Arithmetic/MontgomeryReduction/Definition.v b/src/Arithmetic/MontgomeryReduction/Definition.v index aaa6f2409a..eb8fa476f9 100644 --- a/src/Arithmetic/MontgomeryReduction/Definition.v +++ b/src/Arithmetic/MontgomeryReduction/Definition.v @@ -1,7 +1,7 @@ (*** Montgomery Multiplication *) (** This file implements Montgomery Form, Montgomery Reduction, and Montgomery Multiplication on [Z]. We follow Wikipedia. *) -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.EquivModulo. Require Import Crypto.Util.Notations. diff --git a/src/Arithmetic/MontgomeryReduction/Proofs.v b/src/Arithmetic/MontgomeryReduction/Proofs.v index 374d96e8f5..47b4e3cdf3 100644 --- a/src/Arithmetic/MontgomeryReduction/Proofs.v +++ b/src/Arithmetic/MontgomeryReduction/Proofs.v @@ -2,7 +2,7 @@ (** This file implements the proofs for Montgomery Form, Montgomery Reduction, and Montgomery Multiplication on [Z]. We follow Wikipedia. *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia Coq.Structures.Equalities. +From Coq Require Import ZArith Lia Equalities. Require Import Crypto.Arithmetic.MontgomeryReduction.Definition. Require Import Crypto.Util.ZUtil.EquivModulo. Require Import Crypto.Util.ZUtil.Tactics.PullPush.Modulo. diff --git a/src/Arithmetic/Partition.v b/src/Arithmetic/Partition.v index 6a97422be9..6bdb0a89d1 100644 --- a/src/Arithmetic/Partition.v +++ b/src/Arithmetic/Partition.v @@ -1,7 +1,7 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Orders. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ZUtil.EquivModulo. diff --git a/src/Arithmetic/PrimeFieldTheorems.v b/src/Arithmetic/PrimeFieldTheorems.v index 9cefd0eada..2838989b92 100644 --- a/src/Arithmetic/PrimeFieldTheorems.v +++ b/src/Arithmetic/PrimeFieldTheorems.v @@ -1,14 +1,14 @@ Require Export Crypto.Spec.ModularArithmetic. Require Export Crypto.Arithmetic.ModularArithmeticTheorems. -Require Export Coq.setoid_ring.Ring_theory Coq.setoid_ring.Field_theory Coq.setoid_ring.Field_tac. +From Coq Require Export Ring_theory Field_theory Field_tac. -Require Import Coq.nsatz.Nsatz. -Require Import Coq.micromega.Lia. +From Coq Require Import Nsatz. +From Coq Require Import Lia. Require Import Crypto.Arithmetic.ModularArithmeticPre. Require Import Crypto.Util.NumTheoryUtil. -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.ZArith.BinInt Coq.NArith.BinNat Coq.ZArith.ZArith Coq.ZArith.Znumtheory Coq.NArith.NArith. (* import Zdiv before Znumtheory *) -Require Import Coq.Logic.Eqdep_dec. +From Coq Require Import Morphisms Setoid. +From Coq Require Import BinInt BinNat ZArith Znumtheory NArith. (* import Zdiv before Znumtheory *) +From Coq Require Import Eqdep_dec. Require Import Crypto.Util.NumTheoryUtil. Require Import Crypto.Util.ZUtil.Odd. Require Import Crypto.Util.ZUtil.Modulo. diff --git a/src/Arithmetic/Primitives.v b/src/Arithmetic/Primitives.v index 35cc67f679..07ed0dff60 100644 --- a/src/Arithmetic/Primitives.v +++ b/src/Arithmetic/Primitives.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Arithmetic.MontgomeryReduction.Proofs. (* For MontgomeryReduction *) Require Import Crypto.Util.Tactics.UniquePose. Require Import Crypto.Util.Tuple Crypto.Util.Prod Crypto.Util.LetIn. diff --git a/src/Arithmetic/Saturated.v b/src/Arithmetic/Saturated.v index a12469872e..dd14124b60 100644 --- a/src/Arithmetic/Saturated.v +++ b/src/Arithmetic/Saturated.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Require Import Crypto.Algebra.Ring. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.Partition. diff --git a/src/Arithmetic/SolinasReduction.v b/src/Arithmetic/SolinasReduction.v index 0c4b34ad05..28567d2599 100644 --- a/src/Arithmetic/SolinasReduction.v +++ b/src/Arithmetic/SolinasReduction.v @@ -1,9 +1,9 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.QArith.QArith. -Require Import Coq.QArith.Qround. -Require Import Coq.Strings.String. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import QArith. +From Coq Require Import Qround. +From Coq Require Import String. +From Coq Require Import Derive. +From Coq Require Import List. Require Import Crypto.Util.ZRange. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. @@ -11,11 +11,11 @@ Require Import Crypto.Arithmetic.Partition. Require Import Crypto.Arithmetic.UniformWeight. Require Import Crypto.Arithmetic.Saturated. Require Import (*hints*) Coq.btauto.Algebra. -Require Coq.Structures.OrdersEx. +From Coq Require OrdersEx. Require Import Crypto.Util.ListUtil.StdlibCompat. Require Import Crypto.Util.ZUtil.ModInv. -Require Import Coq.micromega.Lia. +From Coq Require Import Lia. Require Import Crypto.Algebra.Ring. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.LetIn. @@ -32,7 +32,7 @@ Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.ZUtil.Tactics.RewriteModSmall. Require Import Crypto.Util.ZUtil.Tactics.PullPush.Modulo. -Require Import Coq.ZArith.Znat. +From Coq Require Import Znat. Require Import Crypto.Util.CPSUtil. Require Import Crypto.Util.CPSNotations. diff --git a/src/Arithmetic/UniformWeight.v b/src/Arithmetic/UniformWeight.v index 47770368a6..922e41c1c7 100644 --- a/src/Arithmetic/UniformWeight.v +++ b/src/Arithmetic/UniformWeight.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. Require Import Crypto.Arithmetic.Partition. diff --git a/src/Arithmetic/WordByWordMontgomery.v b/src/Arithmetic/WordByWordMontgomery.v index 173815f3ec..30113ef041 100644 --- a/src/Arithmetic/WordByWordMontgomery.v +++ b/src/Arithmetic/WordByWordMontgomery.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Require Import Crypto.Algebra.Ring. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.Freeze. diff --git a/src/ArithmeticCPS/BaseConversion.v b/src/ArithmeticCPS/BaseConversion.v index d005f7908c..7e4ab0ccb2 100644 --- a/src/ArithmeticCPS/BaseConversion.v +++ b/src/ArithmeticCPS/BaseConversion.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import Derive. +From Coq Require Import List. Require Import Crypto.ArithmeticCPS.Core. Require Import Crypto.ArithmeticCPS.ModOps. Require Import Crypto.Arithmetic.Partition. diff --git a/src/ArithmeticCPS/Core.v b/src/ArithmeticCPS/Core.v index 5d73384929..06edf366b8 100644 --- a/src/ArithmeticCPS/Core.v +++ b/src/ArithmeticCPS/Core.v @@ -1,7 +1,7 @@ (* Following http://adam.chlipala.net/theses/andreser.pdf chapter 3 *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Structures.Orders. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import Orders. +From Coq Require Import List. Require Import Crypto.Algebra.Nsatz. Require Import Crypto.Arithmetic.ModularArithmeticTheorems. Require Import Crypto.Util.Decidable. diff --git a/src/ArithmeticCPS/Freeze.v b/src/ArithmeticCPS/Freeze.v index fab7c30bad..27142831ca 100644 --- a/src/ArithmeticCPS/Freeze.v +++ b/src/ArithmeticCPS/Freeze.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil. +From Coq Require Import ZArith Lia. +Require Import QArith_base Qround Crypto.Util.QUtil. Require Import Crypto.ArithmeticCPS.BaseConversion. Require Import Crypto.ArithmeticCPS.Core. Require Import Crypto.ArithmeticCPS.ModOps. diff --git a/src/ArithmeticCPS/ModOps.v b/src/ArithmeticCPS/ModOps.v index c72ba6019d..816eabaf51 100644 --- a/src/ArithmeticCPS/ModOps.v +++ b/src/ArithmeticCPS/ModOps.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.derive.Derive. -Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil. +From Coq Require Import ZArith Lia. +From Coq Require Import Derive. +Require Import QArith_base Qround Crypto.Util.QUtil. Require Import Crypto.ArithmeticCPS.Core. Require Import Crypto.Util.CPSUtil. Require Import Crypto.Util.CPSNotations. diff --git a/src/ArithmeticCPS/Saturated.v b/src/ArithmeticCPS/Saturated.v index 026d1f9bfe..9e753c815e 100644 --- a/src/ArithmeticCPS/Saturated.v +++ b/src/ArithmeticCPS/Saturated.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Require Import Crypto.Algebra.Ring. Require Import Crypto.ArithmeticCPS.Core. Require Import Crypto.Arithmetic.Partition. diff --git a/src/ArithmeticCPS/WordByWordMontgomery.v b/src/ArithmeticCPS/WordByWordMontgomery.v index 419b1ac8e1..3e9604992f 100644 --- a/src/ArithmeticCPS/WordByWordMontgomery.v +++ b/src/ArithmeticCPS/WordByWordMontgomery.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Require Import Crypto.Algebra.Ring. Require Import Crypto.ArithmeticCPS.Core. Require Import Crypto.ArithmeticCPS.Freeze. diff --git a/src/Assembly/Equality.v b/src/Assembly/Equality.v index 3dd801f53e..4575629772 100644 --- a/src/Assembly/Equality.v +++ b/src/Assembly/Equality.v @@ -1,9 +1,9 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.NArith.NArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Bool.Bool. +From Coq Require Import ZArith. +From Coq Require Import NArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import Morphisms. +From Coq Require Import Bool. Require Import Crypto.Util.Option. Require Import Crypto.Util.Bool. Require Import Crypto.Util.Bool.Reflect. diff --git a/src/Assembly/Equivalence.v b/src/Assembly/Equivalence.v index 86985327b2..aff15463cd 100644 --- a/src/Assembly/Equivalence.v +++ b/src/Assembly/Equivalence.v @@ -1,7 +1,7 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. -Require Import Coq.NArith.NArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. +From Coq Require Import NArith. Require Import Crypto.Assembly.Syntax. Require Import Crypto.Assembly.Parse. Require Import Crypto.Assembly.Symbolic. diff --git a/src/Assembly/EquivalenceProofs.v b/src/Assembly/EquivalenceProofs.v index 1ddcc7b752..a4340e146f 100644 --- a/src/Assembly/EquivalenceProofs.v +++ b/src/Assembly/EquivalenceProofs.v @@ -1,10 +1,10 @@ -Require Import Coq.Lists.SetoidList. -Require Import Coq.Sorting.Permutation. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.NArith.NArith. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. +From Coq Require Import SetoidList. +From Coq Require Import Permutation. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import NArith. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. Require Import Crypto.Language.PreExtra. Require Import Crypto.Language.API. Require Import Crypto.Language.APINotations. diff --git a/src/Assembly/Parse.v b/src/Assembly/Parse.v index 960b0044e6..7b0f313d2a 100644 --- a/src/Assembly/Parse.v +++ b/src/Assembly/Parse.v @@ -1,8 +1,8 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import Derive. +From Coq Require Import Ascii. +From Coq Require Import String. +From Coq Require Import List. Require Import Crypto.Assembly.Syntax. Require Import Crypto.Assembly.Equality. Require Import Crypto.Util.OptionList. diff --git a/src/Assembly/Parse/Examples/boringssl_nasm_full_mul_p256.v b/src/Assembly/Parse/Examples/boringssl_nasm_full_mul_p256.v index 0ab978fac2..cc5587eac5 100644 --- a/src/Assembly/Parse/Examples/boringssl_nasm_full_mul_p256.v +++ b/src/Assembly/Parse/Examples/boringssl_nasm_full_mul_p256.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised.v b/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised.v index f1d2cdd2a3..7b2e978b37 100644 --- a/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised.v +++ b/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed10.v b/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed10.v index f1d2cdd2a3..7b2e978b37 100644 --- a/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed10.v +++ b/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed10.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed20.v b/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed20.v index 15d59dc946..58f732fe21 100644 --- a/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed20.v +++ b/src/Assembly/Parse/Examples/fiat_25519_carry_square_optimised_seed20.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed11.v b/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed11.v index 2e1cbda1e4..315565726e 100644 --- a/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed11.v +++ b/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed11.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed12.v b/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed12.v index 0a21d8abba..ba51244fae 100644 --- a/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed12.v +++ b/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed12.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed4.v b/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed4.v index a6ce138c96..b0d11bbcea 100644 --- a/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed4.v +++ b/src/Assembly/Parse/Examples/fiat_p256_mul_optimised_seed4.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed103.v b/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed103.v index f4a4c9eac4..d0d6df471e 100644 --- a/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed103.v +++ b/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed103.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed46.v b/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed46.v index 8b193e8a99..e5b64559f3 100644 --- a/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed46.v +++ b/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed46.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed6.v b/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed6.v index cb8d9273a8..3e237c1e4e 100644 --- a/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed6.v +++ b/src/Assembly/Parse/Examples/fiat_p256_square_optimised_seed6.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String Coq.Lists.List. +From Coq Require Import String List. Import ListNotations. Local Open Scope string_scope. Local Open Scope list_scope. diff --git a/src/Assembly/Parse/TestAsm.v b/src/Assembly/Parse/TestAsm.v index a0691cf861..471a79767f 100644 --- a/src/Assembly/Parse/TestAsm.v +++ b/src/Assembly/Parse/TestAsm.v @@ -1,5 +1,5 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import String. +From Coq Require Import List. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.Strings.Show. Require Import Crypto.Assembly.Parse. diff --git a/src/Assembly/Symbolic.v b/src/Assembly/Symbolic.v index 5043089ea3..593a30c720 100644 --- a/src/Assembly/Symbolic.v +++ b/src/Assembly/Symbolic.v @@ -1,17 +1,17 @@ Require Crypto.Assembly.Parse. -Require Import Coq.Program.Tactics. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.NArith.NArith. -Require Import Coq.Sorting.Permutation. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.OrderedType. -Require Import Coq.Structures.Orders. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.FSets.FMapFacts. +From Coq.Program Require Import Tactics. +From Coq Require Import Derive. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import NArith. +From Coq Require Import Permutation. +From Coq Require Import Equalities. +From Coq Require Import OrderedType. +From Coq Require Import Orders. +From Coq Require Import FMapInterface. +From Coq Require Import FMapPositive. +From Coq Require Import FMapFacts. Require Crypto.Util.ZRange. Require Crypto.Util.Tuple. Require Import Util.OptionList. @@ -79,7 +79,7 @@ Require Import Crypto.Util.Strings.Parse.Common. Require Import Crypto.Util.Tactics.WarnIfGoalsRemain. Require Import Crypto.Util.Bool.Reflect. Require Import coqutil.Z.bitblast. -Require Import Coq.Strings.String. +From Coq Require Import String. Require Import Crypto.Util.Strings.Show. Require Import Crypto.Util.Strings.Show.Enum. Require Import Crypto.Assembly.Syntax. diff --git a/src/Assembly/Syntax.v b/src/Assembly/Syntax.v index 4cb9c94eb6..50dd2e5046 100644 --- a/src/Assembly/Syntax.v +++ b/src/Assembly/Syntax.v @@ -1,8 +1,8 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.NArith.NArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.derive.Derive. +From Coq Require Import ZArith. +From Coq Require Import NArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import Derive. Require Import Crypto.Util.Option. Require Crypto.Util.Tuple. Require Crypto.Util.OptionList. diff --git a/src/Assembly/WithBedrock/Proofs.v b/src/Assembly/WithBedrock/Proofs.v index a3e937e878..aa0cf55824 100644 --- a/src/Assembly/WithBedrock/Proofs.v +++ b/src/Assembly/WithBedrock/Proofs.v @@ -1,9 +1,9 @@ -Require Import Coq.Sorting.Permutation. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.NArith.NArith. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. +From Coq Require Import Permutation. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import NArith. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. Require Import Crypto.Language.PreExtra. Require Import Crypto.Language.API. Require Import Crypto.Language.APINotations. diff --git a/src/Assembly/WithBedrock/Semantics.v b/src/Assembly/WithBedrock/Semantics.v index 1a4c64f3aa..f436d155d7 100644 --- a/src/Assembly/WithBedrock/Semantics.v +++ b/src/Assembly/WithBedrock/Semantics.v @@ -1,10 +1,10 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.NArith.NArith. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Bool.Bool. +From Coq Require Import ZArith. +From Coq Require Import NArith. +From Coq Require Import FMapPositive. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import Morphisms. +From Coq Require Import Bool. Require Import Crypto.Util.Option. Require Import Crypto.Util.Bool. Require Import Crypto.Util.Bool.Reflect. diff --git a/src/Assembly/WithBedrock/SymbolicProofs.v b/src/Assembly/WithBedrock/SymbolicProofs.v index b82c131f96..38e9c0ccaf 100644 --- a/src/Assembly/WithBedrock/SymbolicProofs.v +++ b/src/Assembly/WithBedrock/SymbolicProofs.v @@ -1,8 +1,8 @@ -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import List. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Tactics.PullPush. -Require Import Coq.NArith.NArith. -Require Import Coq.ZArith.ZArith. +From Coq Require Import NArith. +From Coq Require Import ZArith. Require Import Crypto.AbstractInterpretation.ZRange. Require Import Crypto.Util.ErrorT. Import Coq.Lists.List. (* [map] is [List.map] not [ErrorT.map] *) diff --git a/src/Bedrock/End2End/Poly1305/Field1305.v b/src/Bedrock/End2End/Poly1305/Field1305.v index f8356bf29e..bd8117a0ff 100644 --- a/src/Bedrock/End2End/Poly1305/Field1305.v +++ b/src/Bedrock/End2End/Poly1305/Field1305.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import Crypto.Arithmetic.PrimeFieldTheorems. Require Import Crypto.Bedrock.Field.Interface.Representation. Require Import Crypto.Bedrock.Field.Synthesis.New.ComputedOp. diff --git a/src/Bedrock/End2End/RupicolaCrypto/Broadcast.v b/src/Bedrock/End2End/RupicolaCrypto/Broadcast.v index c8680322cc..a8a84d3aa3 100644 --- a/src/Bedrock/End2End/RupicolaCrypto/Broadcast.v +++ b/src/Bedrock/End2End/RupicolaCrypto/Broadcast.v @@ -1,10 +1,10 @@ -Require Import Coq.Unicode.Utf8. +From Coq Require Import Utf8. Require Import Rupicola.Lib.Api. Require Import Rupicola.Lib.Loops. -Require Coq.Init.Byte Coq.Strings.String. Import Init.Byte(byte(..)) String. +From Coq Require Init.Byte String. Import Init.Byte(byte(..)) String. Require Import coqutil.Datatypes.List. Import Lists.List List.ListNotations. -Require Import Coq.ZArith.BinInt. Import Zdiv. Local Open Scope Z_scope. +From Coq Require Import BinInt. Import Zdiv. Local Open Scope Z_scope. Require Import coqutil.Byte coqutil.Word.LittleEndianList. (* TODO: move into core Bedrock *) diff --git a/src/Bedrock/End2End/RupicolaCrypto/ChaCha20.v b/src/Bedrock/End2End/RupicolaCrypto/ChaCha20.v index 94b1a6edad..10d6d1d36b 100644 --- a/src/Bedrock/End2End/RupicolaCrypto/ChaCha20.v +++ b/src/Bedrock/End2End/RupicolaCrypto/ChaCha20.v @@ -1,5 +1,5 @@ (* Rewritten versions of poly1305 and chacha20 that you can compile with Rupicola *) -Require Import Coq.Unicode.Utf8. +From Coq Require Import Utf8. Require Import Rupicola.Lib.Api. Require Import Rupicola.Lib.Loops. (*TODO: move this file to Rupicola.Lib*) diff --git a/src/Bedrock/End2End/RupicolaCrypto/Spec.v b/src/Bedrock/End2End/RupicolaCrypto/Spec.v index 5bfb3d6196..2cf03c3334 100644 --- a/src/Bedrock/End2End/RupicolaCrypto/Spec.v +++ b/src/Bedrock/End2End/RupicolaCrypto/Spec.v @@ -1,6 +1,6 @@ -Require Coq.Init.Byte Coq.Strings.String. Export Init.Byte(byte(..)) String. +From Coq Require Init.Byte String. Export Init.Byte(byte(..)) String. Require Export coqutil.Datatypes.List. Export Lists.List List.ListNotations. -Require Export Coq.ZArith.BinInt. Export Zdiv. Local Open Scope Z_scope. +From Coq Require Export BinInt. Export Zdiv. Local Open Scope Z_scope. Require Export coqutil.Byte coqutil.Word.LittleEndianList. diff --git a/src/Bedrock/End2End/X25519/EdwardsXYZT.v b/src/Bedrock/End2End/X25519/EdwardsXYZT.v index 67e865b9d9..1b7a02e0fb 100644 --- a/src/Bedrock/End2End/X25519/EdwardsXYZT.v +++ b/src/Bedrock/End2End/X25519/EdwardsXYZT.v @@ -21,10 +21,10 @@ From coqutil.Tactics Require Import Tactics letexists eabstract rdelta reference Require Import coqutil.Word.Bitwidth32. Require Import coqutil.Word.Bitwidth. Require Import coqutil.Word.Interface. -Require Import Coq.Init.Byte. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Init.Byte. +From Coq Require Import List. +From Coq Require Import String. +From Coq Require Import ZArith. Require Import Crypto.Arithmetic.PrimeFieldTheorems. Require Import Crypto.Bedrock.Field.Interface.Compilation2. Require Import Crypto.Bedrock.Field.Synthesis.New.UnsaturatedSolinas. diff --git a/src/Bedrock/End2End/X25519/Field25519.v b/src/Bedrock/End2End/X25519/Field25519.v index 5ff884eb16..0d686419de 100644 --- a/src/Bedrock/End2End/X25519/Field25519.v +++ b/src/Bedrock/End2End/X25519/Field25519.v @@ -1,7 +1,7 @@ Require Import Crypto.Spec.Curve25519. -Require Import Coq.Strings.String. Local Open Scope string_scope. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. Local Open Scope string_scope. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import coqutil.Word.Bitwidth32. Require Import coqutil.Macros.WithBaseName. Require Import Crypto.Arithmetic.PrimeFieldTheorems. diff --git a/src/Bedrock/End2End/X25519/GarageDoor.v b/src/Bedrock/End2End/X25519/GarageDoor.v index 109ff3493a..7450badbb3 100644 --- a/src/Bedrock/End2End/X25519/GarageDoor.v +++ b/src/Bedrock/End2End/X25519/GarageDoor.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import Crypto.Spec.Curve25519. Require Import bedrock2.Map.Separation. Require Import bedrock2.Syntax. diff --git a/src/Bedrock/End2End/X25519/GarageDoorTop.v b/src/Bedrock/End2End/X25519/GarageDoorTop.v index 552305aa4e..ea55a5b933 100644 --- a/src/Bedrock/End2End/X25519/GarageDoorTop.v +++ b/src/Bedrock/End2End/X25519/GarageDoorTop.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import Crypto.Spec.Curve25519. Require Import bedrock2.Map.Separation. Require Import bedrock2.Syntax. diff --git a/src/Bedrock/End2End/X25519/MontgomeryLadder.v b/src/Bedrock/End2End/X25519/MontgomeryLadder.v index 5a8673baad..3b4fbd2861 100644 --- a/src/Bedrock/End2End/X25519/MontgomeryLadder.v +++ b/src/Bedrock/End2End/X25519/MontgomeryLadder.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import Crypto.Util.Decidable. Require Import Crypto.Spec.MontgomeryCurve. Require Import Crypto.Spec.Curve25519. @@ -60,7 +60,8 @@ Import LittleEndianList. Local Coercion F.to_Z : F >-> Z. Require Import bedrock2.WeakestPrecondition bedrock2.Semantics bedrock2.ProgramLogic. Require Import bedrock2.Syntax bedrock2.Map.SeparationLogic. -Require Import Coq.Init.Byte coqutil.Byte. +From Coq.Init Require Import Byte. +Require Import coqutil.Byte. Import ProgramLogic.Coercions. Local Notation "m =* P" := ((P%sep) m) (at level 70, only parsing) (* experiment*). Local Notation "xs $@ a" := (Array.array ptsto (word.of_Z 1) a xs) (at level 10, format "xs $@ a"). diff --git a/src/Bedrock/End2End/X25519/MontgomeryLadderRISCV.v b/src/Bedrock/End2End/X25519/MontgomeryLadderRISCV.v index 642472ac88..628764a412 100644 --- a/src/Bedrock/End2End/X25519/MontgomeryLadderRISCV.v +++ b/src/Bedrock/End2End/X25519/MontgomeryLadderRISCV.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import bedrock2.Map.Separation. Require Import bedrock2.Map.SeparationLogic. Require Import bedrock2.Syntax. diff --git a/src/Bedrock/End2End/X25519/clamp.v b/src/Bedrock/End2End/X25519/clamp.v index d5336185c9..350390f101 100644 --- a/src/Bedrock/End2End/X25519/clamp.v +++ b/src/Bedrock/End2End/X25519/clamp.v @@ -53,9 +53,9 @@ Qed. From Coq Require Import ZArith Lia. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.Init.Byte. +From Coq Require Import String. +From Coq Require Import List. +From Coq.Init Require Import Byte. Require Import bedrock2.Map.Separation. Require Import bedrock2.Syntax. Require Import bedrock2.NotationsCustomEntry. diff --git a/src/Bedrock/Field/Common/Arrays/ByteBounds.v b/src/Bedrock/Field/Common/Arrays/ByteBounds.v index ee56119832..f6b18e69c5 100644 --- a/src/Bedrock/Field/Common/Arrays/ByteBounds.v +++ b/src/Bedrock/Field/Common/Arrays/ByteBounds.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. Require Import coqutil.Word.Interface. Require Import coqutil.Word.Properties. Require Import coqutil.Datatypes.List. diff --git a/src/Bedrock/Field/Common/Arrays/MakeAccessSizes.v b/src/Bedrock/Field/Common/Arrays/MakeAccessSizes.v index 69f5974335..366a968f19 100644 --- a/src/Bedrock/Field/Common/Arrays/MakeAccessSizes.v +++ b/src/Bedrock/Field/Common/Arrays/MakeAccessSizes.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. Require Import bedrock2.Syntax. Require Import coqutil.Tactics.Tactics. Require Import coqutil.Word.Interface coqutil.Word.Properties. diff --git a/src/Bedrock/Field/Common/Arrays/MakeListLengths.v b/src/Bedrock/Field/Common/Arrays/MakeListLengths.v index cde86dca51..e2b717afba 100644 --- a/src/Bedrock/Field/Common/Arrays/MakeListLengths.v +++ b/src/Bedrock/Field/Common/Arrays/MakeListLengths.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import List. Require Import Crypto.AbstractInterpretation.AbstractInterpretation. Require Import Crypto.Bedrock.Field.Common.Types. Require Import Crypto.Language.API. diff --git a/src/Bedrock/Field/Common/Arrays/MaxBounds.v b/src/Bedrock/Field/Common/Arrays/MaxBounds.v index a1037573f1..0e9baeac31 100644 --- a/src/Bedrock/Field/Common/Arrays/MaxBounds.v +++ b/src/Bedrock/Field/Common/Arrays/MaxBounds.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. Require Import coqutil.Word.Interface. Require Import coqutil.Word.Properties. Require Import coqutil.Datatypes.List. diff --git a/src/Bedrock/Field/Common/Names/MakeNames.v b/src/Bedrock/Field/Common/Names/MakeNames.v index dbcf17a350..b773e292cf 100644 --- a/src/Bedrock/Field/Common/Names/MakeNames.v +++ b/src/Bedrock/Field/Common/Names/MakeNames.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.Strings.String. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import String. Require Import coqutil.Datatypes.List. Require Import coqutil.Datatypes.PropSet. Require Import Crypto.Bedrock.Field.Common.Tactics. diff --git a/src/Bedrock/Field/Common/Names/VarnameGenerator.v b/src/Bedrock/Field/Common/Names/VarnameGenerator.v index 9aaa0a4118..c30f72b873 100644 --- a/src/Bedrock/Field/Common/Names/VarnameGenerator.v +++ b/src/Bedrock/Field/Common/Names/VarnameGenerator.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. +From Coq Require Import ZArith. +From Coq Require Import String. Require Import Crypto.Util.Strings.Decimal. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Strings.String. diff --git a/src/Bedrock/Field/Common/Types.v b/src/Bedrock/Field/Common/Types.v index 9c0ec00837..04fb56d6d3 100644 --- a/src/Bedrock/Field/Common/Types.v +++ b/src/Bedrock/Field/Common/Types.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. Require bedrock2.Syntax. Require bedrock2.Semantics. Require bedrock2.WeakestPrecondition. diff --git a/src/Bedrock/Field/Common/Util.v b/src/Bedrock/Field/Common/Util.v index 1b4a3130ac..6206704869 100644 --- a/src/Bedrock/Field/Common/Util.v +++ b/src/Bedrock/Field/Common/Util.v @@ -1,8 +1,8 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Classes.RelationClasses. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import Morphisms. +From Coq Require Import RelationClasses. Require Import bedrock2.Array. Require Import bedrock2.Scalars. Require Import bedrock2.Syntax. @@ -22,7 +22,7 @@ Require Import Crypto.Util.Option. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ZUtil.Modulo. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. -Require Import Coq.Lists.List. (* after SeparationLogic *) +From Coq Require Import List. (* after SeparationLogic *) Import ListNotations. Import AbstractInterpretation.Compilers. diff --git a/src/Bedrock/Field/Interface/Representation.v b/src/Bedrock/Field/Interface/Representation.v index 774c2f3f5b..6d71f646ce 100644 --- a/src/Bedrock/Field/Interface/Representation.v +++ b/src/Bedrock/Field/Interface/Representation.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. Require Import coqutil.Byte. Require Import coqutil.Word.Interface. Require Import bedrock2.Semantics. diff --git a/src/Bedrock/Field/Stringification/FlattenVarData.v b/src/Bedrock/Field/Stringification/FlattenVarData.v index 5f7e5962e2..f153609548 100644 --- a/src/Bedrock/Field/Stringification/FlattenVarData.v +++ b/src/Bedrock/Field/Stringification/FlattenVarData.v @@ -1,7 +1,7 @@ (* This file is a duplicate of Flatten.v, but talks about var_data instead of ltype *) -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.Stringification.Language. Require Crypto.Stringification.C. Require Crypto.Stringification.IR. diff --git a/src/Bedrock/Field/Stringification/LoadStoreListVarData.v b/src/Bedrock/Field/Stringification/LoadStoreListVarData.v index 62cb7b60bc..505f636183 100644 --- a/src/Bedrock/Field/Stringification/LoadStoreListVarData.v +++ b/src/Bedrock/Field/Stringification/LoadStoreListVarData.v @@ -1,7 +1,7 @@ (* This file is a partial duplicate of LoadStoreList.v, but talks about var_data instead of ltype *) -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.Stringification.Language. Require Import Crypto.Language.API. Require Import Crypto.Bedrock.Field.Common.Types. diff --git a/src/Bedrock/Field/Stringification/Stringification.v b/src/Bedrock/Field/Stringification/Stringification.v index 9ae50c049b..69d287c1d7 100644 --- a/src/Bedrock/Field/Stringification/Stringification.v +++ b/src/Bedrock/Field/Stringification/Stringification.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import String. Require Import bedrock2.Syntax. Require Import bedrock2.ToCString. Require Import coqutil.Word.Naive coqutil.Map.SortedListWord coqutil.Map.SortedListString. diff --git a/src/Bedrock/Field/Synthesis/Examples/p224_64_new.v b/src/Bedrock/Field/Synthesis/Examples/p224_64_new.v index 22311339fe..90cb31fe09 100644 --- a/src/Bedrock/Field/Synthesis/Examples/p224_64_new.v +++ b/src/Bedrock/Field/Synthesis/Examples/p224_64_new.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import Crypto.Arithmetic.PrimeFieldTheorems. Require Import Crypto.Bedrock.Field.Interface.Representation. Require Import Crypto.Bedrock.Field.Synthesis.New.ComputedOp. diff --git a/src/Bedrock/Field/Synthesis/Examples/redc.v b/src/Bedrock/Field/Synthesis/Examples/redc.v index 0576fec92c..d7a60b4180 100644 --- a/src/Bedrock/Field/Synthesis/Examples/redc.v +++ b/src/Bedrock/Field/Synthesis/Examples/redc.v @@ -11,9 +11,9 @@ Require Import coqutil.Map.Interface. From coqutil.Tactics Require Import Tactics letexists eabstract. -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. From coqutil.Z Require Import div_mod_to_equations Lia. -Require Import Coq.Program.Tactics. +From Coq.Program Require Import Tactics. Require Import Crypto.Arithmetic.WordByWordMontgomery. Import Markers. diff --git a/src/Bedrock/Field/Synthesis/Generic/Bignum.v b/src/Bedrock/Field/Synthesis/Generic/Bignum.v index 3f163b396c..8fe60a3f14 100644 --- a/src/Bedrock/Field/Synthesis/Generic/Bignum.v +++ b/src/Bedrock/Field/Synthesis/Generic/Bignum.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. Require Import coqutil.Datatypes.List. Require Import bedrock2.Array. Require Import bedrock2.Scalars. diff --git a/src/Bedrock/Field/Synthesis/New/Signature.v b/src/Bedrock/Field/Synthesis/New/Signature.v index def9e8201b..fea39bc263 100644 --- a/src/Bedrock/Field/Synthesis/New/Signature.v +++ b/src/Bedrock/Field/Synthesis/New/Signature.v @@ -1,9 +1,9 @@ Require Rupicola.Lib.Tactics. -Require Import Coq.micromega.Lia. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. (* after strings *) -Require Import Coq.QArith.QArith. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import String. +From Coq Require Import List. (* after strings *) +From Coq Require Import QArith. +From Coq Require Import ZArith. Require Import bedrock2.Map.Separation. Require Import bedrock2.Map.SeparationLogic. Require Import bedrock2.ProgramLogic. diff --git a/src/Bedrock/Field/Synthesis/New/UnsaturatedSolinas.v b/src/Bedrock/Field/Synthesis/New/UnsaturatedSolinas.v index 24b31263cb..6cb01f6b33 100644 --- a/src/Bedrock/Field/Synthesis/New/UnsaturatedSolinas.v +++ b/src/Bedrock/Field/Synthesis/New/UnsaturatedSolinas.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import bedrock2.Syntax. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Spec.ModularArithmetic. @@ -626,7 +626,7 @@ End UnsaturatedSolinas. (* Prototyping full pipeline: *) -Require Import Coq.Strings.String. +From Coq Require Import String. Require Import Crypto.Bedrock.Field.Translation.Proofs.ValidComputable.Func. (* TODO: move somewhere common *) diff --git a/src/Bedrock/Field/Synthesis/New/WordByWordMontgomery.v b/src/Bedrock/Field/Synthesis/New/WordByWordMontgomery.v index 2ddae62112..116af4d674 100644 --- a/src/Bedrock/Field/Synthesis/New/WordByWordMontgomery.v +++ b/src/Bedrock/Field/Synthesis/New/WordByWordMontgomery.v @@ -1,7 +1,7 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import bedrock2.Syntax. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Spec.ModularArithmetic. @@ -747,7 +747,7 @@ End WordByWordMontgomery. (* Prototyping full pipeline: *) -Require Import Coq.Strings.String. +From Coq Require Import String. Require Import Crypto.Bedrock.Field.Translation.Parameters.Defaults64. Require Import Crypto.Bedrock.Field.Translation.Proofs.ValidComputable.Func. diff --git a/src/Bedrock/Field/Translation/Cmd.v b/src/Bedrock/Field/Translation/Cmd.v index 80f4ec191c..b1df50dabe 100644 --- a/src/Bedrock/Field/Translation/Cmd.v +++ b/src/Bedrock/Field/Translation/Cmd.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.Bedrock.Field.Common.Types. Require Import Crypto.Bedrock.Field.Translation.Expr. Require Import Crypto.Language.API. diff --git a/src/Bedrock/Field/Translation/Expr.v b/src/Bedrock/Field/Translation/Expr.v index e87516a669..85ec714a4d 100644 --- a/src/Bedrock/Field/Translation/Expr.v +++ b/src/Bedrock/Field/Translation/Expr.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import List. Require Import bedrock2.Syntax. Require Import Crypto.Bedrock.Field.Common.Types. Require Import Crypto.Language.API. diff --git a/src/Bedrock/Field/Translation/Flatten.v b/src/Bedrock/Field/Translation/Flatten.v index c10e4bc104..b5512a3e0a 100644 --- a/src/Bedrock/Field/Translation/Flatten.v +++ b/src/Bedrock/Field/Translation/Flatten.v @@ -1,6 +1,6 @@ (* IF YOU CHANGE THIS FILE YOU MUST ALSO CHANGE src/Bedrock/Field/Stringification/FlattenVarData.v ! *) -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import String. +From Coq Require Import List. Require Import bedrock2.Array. Require Import bedrock2.Syntax. Require Import bedrock2.Semantics. diff --git a/src/Bedrock/Field/Translation/Func.v b/src/Bedrock/Field/Translation/Func.v index aaef1dbb29..0e572df306 100644 --- a/src/Bedrock/Field/Translation/Func.v +++ b/src/Bedrock/Field/Translation/Func.v @@ -1,5 +1,5 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import String. +From Coq Require Import List. Require Import bedrock2.Syntax. Require Import coqutil.Word.Interface. Require Import coqutil.Map.Interface. diff --git a/src/Bedrock/Field/Translation/LoadStoreList.v b/src/Bedrock/Field/Translation/LoadStoreList.v index ef5c8ea03a..f8f20d7ffb 100644 --- a/src/Bedrock/Field/Translation/LoadStoreList.v +++ b/src/Bedrock/Field/Translation/LoadStoreList.v @@ -1,8 +1,8 @@ (* IF YOU CHANGE THIS FILE YOU MUST ALSO CHANGE src/Bedrock/Field/Stringification/LoadStoreListVarData.v ! *) -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import ZArith. Require Import bedrock2.Array. Require Import bedrock2.Scalars. Require Import bedrock2.Syntax. diff --git a/src/Bedrock/Field/Translation/Parameters/Defaults.v b/src/Bedrock/Field/Translation/Parameters/Defaults.v index 6368951977..5563b4544f 100644 --- a/src/Bedrock/Field/Translation/Parameters/Defaults.v +++ b/src/Bedrock/Field/Translation/Parameters/Defaults.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. Require Import coqutil.Word.Interface. Require Import bedrock2.Syntax. Require Import Crypto.Bedrock.Field.Common.Types. diff --git a/src/Bedrock/Field/Translation/Parameters/Defaults32.v b/src/Bedrock/Field/Translation/Parameters/Defaults32.v index db5083f213..c5ec4fe5cb 100644 --- a/src/Bedrock/Field/Translation/Parameters/Defaults32.v +++ b/src/Bedrock/Field/Translation/Parameters/Defaults32.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. Require Import bedrock2.Syntax. Require Import bedrock2.Semantics. Require Import bedrock2.BasicC32Semantics. diff --git a/src/Bedrock/Field/Translation/Parameters/Defaults64.v b/src/Bedrock/Field/Translation/Parameters/Defaults64.v index 526883a7e5..34d8deeaf3 100644 --- a/src/Bedrock/Field/Translation/Parameters/Defaults64.v +++ b/src/Bedrock/Field/Translation/Parameters/Defaults64.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. Require Import bedrock2.Syntax. Require Import bedrock2.Semantics. Require Import bedrock2.BasicC64Semantics. diff --git a/src/Bedrock/Field/Translation/Parameters/FE310.v b/src/Bedrock/Field/Translation/Parameters/FE310.v index bfc8ca27f0..af78723f3d 100644 --- a/src/Bedrock/Field/Translation/Parameters/FE310.v +++ b/src/Bedrock/Field/Translation/Parameters/FE310.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. Require Import bedrock2.Syntax. Require Import bedrock2.Semantics. Require Import bedrock2.FE310CSemantics. diff --git a/src/Bedrock/Field/Translation/Proofs/Cmd.v b/src/Bedrock/Field/Translation/Proofs/Cmd.v index f5e55e561d..e0d1e78030 100644 --- a/src/Bedrock/Field/Translation/Proofs/Cmd.v +++ b/src/Bedrock/Field/Translation/Proofs/Cmd.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.Strings.String. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import String. Require Import bedrock2.ProgramLogic. Require Import bedrock2.Map.Separation. Require Import bedrock2.Map.SeparationLogic. diff --git a/src/Bedrock/Field/Translation/Proofs/Equivalence.v b/src/Bedrock/Field/Translation/Proofs/Equivalence.v index ada12d545e..00e9d949ae 100644 --- a/src/Bedrock/Field/Translation/Proofs/Equivalence.v +++ b/src/Bedrock/Field/Translation/Proofs/Equivalence.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. Require Import bedrock2.Semantics. Require Import bedrock2.Map.Separation. Require Import bedrock2.Array bedrock2.Scalars. diff --git a/src/Bedrock/Field/Translation/Proofs/EquivalenceProperties.v b/src/Bedrock/Field/Translation/Proofs/EquivalenceProperties.v index 664c431e4b..ae7973daa2 100644 --- a/src/Bedrock/Field/Translation/Proofs/EquivalenceProperties.v +++ b/src/Bedrock/Field/Translation/Proofs/EquivalenceProperties.v @@ -1,11 +1,11 @@ -Require Import Coq.Strings.String. +From Coq Require Import String. Require Import bedrock2.Syntax. Require Import bedrock2.Map.Separation. Require Import bedrock2.Map.SeparationLogic. Require Import coqutil.Map.Interface coqutil.Map.Properties. Require Import coqutil.Word.Interface coqutil.Word.Properties. Require Import coqutil.Datatypes.PropSet. -Require Import Coq.Lists.List. (* after SeparationLogic *) +From Coq Require Import List. (* after SeparationLogic *) Require Import Crypto.Bedrock.Field.Common.Types. Require Import Crypto.Bedrock.Field.Translation.Proofs.Equivalence. Require Import Crypto.Bedrock.Field.Translation.Proofs.UsedVarnames. diff --git a/src/Bedrock/Field/Translation/Proofs/Expr.v b/src/Bedrock/Field/Translation/Proofs/Expr.v index 3fffc6fb67..f92cdb2c04 100644 --- a/src/Bedrock/Field/Translation/Proofs/Expr.v +++ b/src/Bedrock/Field/Translation/Proofs/Expr.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. Require Import bedrock2.Syntax. Require Import bedrock2.WeakestPreconditionProperties. Require Import coqutil.Word.Interface coqutil.Word.Properties. diff --git a/src/Bedrock/Field/Translation/Proofs/Flatten.v b/src/Bedrock/Field/Translation/Proofs/Flatten.v index 9f441dd311..b15d21290f 100644 --- a/src/Bedrock/Field/Translation/Proofs/Flatten.v +++ b/src/Bedrock/Field/Translation/Proofs/Flatten.v @@ -1,7 +1,7 @@ -Require Import Coq.Strings.String. -Require Import Coq.Arith.PeanoNat. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import String. +From Coq Require Import PeanoNat. +From Coq Require Import List. +From Coq Require Import Lia. Require Import bedrock2.Syntax. Require Import bedrock2.Map.Separation. Require Import bedrock2.Map.SeparationLogic. diff --git a/src/Bedrock/Field/Translation/Proofs/Func.v b/src/Bedrock/Field/Translation/Proofs/Func.v index 0105402334..b621418acc 100644 --- a/src/Bedrock/Field/Translation/Proofs/Func.v +++ b/src/Bedrock/Field/Translation/Proofs/Func.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import Lia. Require Import bedrock2.Syntax. Require Import bedrock2.ProgramLogic. Require Import bedrock2.Map.Separation. diff --git a/src/Bedrock/Field/Translation/Proofs/LoadStoreList.v b/src/Bedrock/Field/Translation/Proofs/LoadStoreList.v index 8e45c8835e..96a65840f8 100644 --- a/src/Bedrock/Field/Translation/Proofs/LoadStoreList.v +++ b/src/Bedrock/Field/Translation/Proofs/LoadStoreList.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import Lia. Require Import bedrock2.Array. Require Import bedrock2.Scalars. Require Import bedrock2.Syntax. diff --git a/src/Bedrock/Field/Translation/Proofs/UsedVarnames.v b/src/Bedrock/Field/Translation/Proofs/UsedVarnames.v index 08e9439833..bd76e32c08 100644 --- a/src/Bedrock/Field/Translation/Proofs/UsedVarnames.v +++ b/src/Bedrock/Field/Translation/Proofs/UsedVarnames.v @@ -1,13 +1,13 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import String. +From Coq Require Import Lia. Require Import bedrock2.Syntax. Require Import bedrock2.Map.Separation. Require Import bedrock2.Map.SeparationLogic. Require Import coqutil.Map.Interface coqutil.Map.Properties. Require Import coqutil.Word.Interface coqutil.Word.Properties. Require Import coqutil.Datatypes.PropSet. -Require Import Coq.Lists.List. (* after SeparationLogic *) +From Coq Require Import List. (* after SeparationLogic *) Require Import Crypto.Bedrock.Field.Common.Types. Require Import Crypto.Bedrock.Field.Translation.Proofs.VarnameSet. Require Import Crypto.Bedrock.Field.Common.Tactics. diff --git a/src/Bedrock/Field/Translation/Proofs/ValidComputable/Cmd.v b/src/Bedrock/Field/Translation/Proofs/ValidComputable/Cmd.v index 4227898e52..cfa9b22ffa 100644 --- a/src/Bedrock/Field/Translation/Proofs/ValidComputable/Cmd.v +++ b/src/Bedrock/Field/Translation/Proofs/ValidComputable/Cmd.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Lia. Require Import (*hints*) Coq.btauto.Algebra. Require Import bedrock2.Syntax. Require Import coqutil.Word.Interface coqutil.Word.Properties. diff --git a/src/Bedrock/Field/Translation/Proofs/ValidComputable/Expr.v b/src/Bedrock/Field/Translation/Proofs/ValidComputable/Expr.v index e2fb50f6a4..24b2c189cf 100644 --- a/src/Bedrock/Field/Translation/Proofs/ValidComputable/Expr.v +++ b/src/Bedrock/Field/Translation/Proofs/ValidComputable/Expr.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Lia. Require Import (*hints*) Coq.btauto.Algebra. Require Import bedrock2.Syntax. Require Import coqutil.Word.Interface coqutil.Word.Properties. diff --git a/src/Bedrock/Field/Translation/Proofs/ValidComputable/Func.v b/src/Bedrock/Field/Translation/Proofs/ValidComputable/Func.v index bf3620edc0..3555d1c897 100644 --- a/src/Bedrock/Field/Translation/Proofs/ValidComputable/Func.v +++ b/src/Bedrock/Field/Translation/Proofs/ValidComputable/Func.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Lia. Require Import bedrock2.Syntax. Require Import coqutil.Word.Interface coqutil.Word.Properties. Require Import coqutil.Map.Interface. diff --git a/src/Bedrock/Field/Translation/Proofs/VarnameSet.v b/src/Bedrock/Field/Translation/Proofs/VarnameSet.v index ac81fd7207..b01a853ea5 100644 --- a/src/Bedrock/Field/Translation/Proofs/VarnameSet.v +++ b/src/Bedrock/Field/Translation/Proofs/VarnameSet.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String. +From Coq Require Import String. Require Import Crypto.Bedrock.Field.Common.Types. Require Import Crypto.Language.API. Local Open Scope Z_scope. diff --git a/src/Bedrock/Group/AdditionChains.v b/src/Bedrock/Group/AdditionChains.v index 1393770f55..f7529d8902 100644 --- a/src/Bedrock/Group/AdditionChains.v +++ b/src/Bedrock/Group/AdditionChains.v @@ -7,7 +7,7 @@ Require Import Crypto.Arithmetic.FLia. Require Import Crypto.Bedrock.Specs.Field. Require Import Crypto.Bedrock.Field.Interface.Compilation2. Require Import Crypto.Algebra.Hierarchy. -Require Import Numbers.DecimalString. +From Coq Require Import DecimalString. Local Open Scope Z_scope. diff --git a/src/Bedrock/Group/Loops.v b/src/Bedrock/Group/Loops.v index e098b71186..4ffbf73483 100644 --- a/src/Bedrock/Group/Loops.v +++ b/src/Bedrock/Group/Loops.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import List. Require Import Rupicola.Lib.ControlFlow.DownTo. Require Import Crypto.Util.Loops. Require Import Crypto.Util.ListUtil. diff --git a/src/Bedrock/Group/ScalarMult/CSwap.v b/src/Bedrock/Group/ScalarMult/CSwap.v index 5cb176ab3c..4369b29b05 100644 --- a/src/Bedrock/Group/ScalarMult/CSwap.v +++ b/src/Bedrock/Group/ScalarMult/CSwap.v @@ -1,4 +1,4 @@ -Require Import Coq.Program.Tactics. +From Coq.Program Require Import Tactics. Require Import Rupicola.Lib.Api. Require Import Rupicola.Lib.Loops. Require Import bedrock2.Semantics. diff --git a/src/Bedrock/Standalone/StandaloneHaskellMain.v b/src/Bedrock/Standalone/StandaloneHaskellMain.v index 521ad6d2c1..7798e69c9d 100644 --- a/src/Bedrock/Standalone/StandaloneHaskellMain.v +++ b/src/Bedrock/Standalone/StandaloneHaskellMain.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.CLI. Require Export Crypto.StandaloneHaskellMain. Require Import Crypto.Bedrock.Field.Stringification.Stringification. diff --git a/src/Bedrock/Standalone/StandaloneJsOfOCamlMain.v b/src/Bedrock/Standalone/StandaloneJsOfOCamlMain.v index 4835ae225a..32efaf277a 100644 --- a/src/Bedrock/Standalone/StandaloneJsOfOCamlMain.v +++ b/src/Bedrock/Standalone/StandaloneJsOfOCamlMain.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.CLI. Require Export Crypto.StandaloneJsOfOCamlMain. Require Import Crypto.Bedrock.Field.Stringification.Stringification. diff --git a/src/Bedrock/Standalone/StandaloneOCamlMain.v b/src/Bedrock/Standalone/StandaloneOCamlMain.v index b8d603393d..81d60d606d 100644 --- a/src/Bedrock/Standalone/StandaloneOCamlMain.v +++ b/src/Bedrock/Standalone/StandaloneOCamlMain.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.CLI. Require Export Crypto.StandaloneOCamlMain. Require Import Crypto.Bedrock.Field.Stringification.Stringification. diff --git a/src/BoundsPipeline.v b/src/BoundsPipeline.v index de40f32702..bb0fd5b500 100644 --- a/src/BoundsPipeline.v +++ b/src/BoundsPipeline.v @@ -2,10 +2,10 @@ (** This file assembles the various compiler stages together into a composed pipeline. It is the final interface for the compiler, right before integration with Arithmetic. *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.QArith.QArith_base. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import ZArith. +From Coq Require Import QArith_base. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.Util.ZUtil.Log2. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.ZUtil.Tactics.ReplaceNegWithPos. diff --git a/src/CLI.v b/src/CLI.v index 059ac24d4e..e8300fec1a 100644 --- a/src/CLI.v +++ b/src/CLI.v @@ -1,9 +1,9 @@ -Require Import Coq.QArith.QArith. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.Ascii. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. -Require Import Coq.Strings.HexString. +From Coq Require Import QArith. +From Coq Require Import ZArith. +From Coq Require Import Ascii. +From Coq Require Import List. +From Coq Require Import String. +From Coq Require Import HexString. Require Crypto.Util.Strings.String. Require Import Crypto.Assembly.Syntax. Require Import Crypto.Assembly.Parse. diff --git a/src/COperationSpecifications.v b/src/COperationSpecifications.v index cb112805ea..3647abf017 100644 --- a/src/COperationSpecifications.v +++ b/src/COperationSpecifications.v @@ -1,7 +1,7 @@ (** * C Operation Specifications *) (** The specifications for the various operations to be synthesized. *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. Require Import Crypto.Arithmetic.BaseConversion. diff --git a/src/CastLemmas.v b/src/CastLemmas.v index a7b67758f7..0d610f4b23 100644 --- a/src/CastLemmas.v +++ b/src/CastLemmas.v @@ -1,9 +1,9 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relations. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import FMapPositive. +From Coq Require Import Morphisms. +From Coq Require Import Relations. Require Export Crypto.Language.PreExtra. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.DestructHead. diff --git a/src/CompilersTestCases.v b/src/CompilersTestCases.v index 96a78ac639..9132e07d67 100644 --- a/src/CompilersTestCases.v +++ b/src/CompilersTestCases.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. +From Coq Require Import String. +From Coq Require Import ZArith. +From Coq Require Import List. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.LetIn. Require Import Rewriter.Language.Language. diff --git a/src/Curves/Edwards/AffineProofs.v b/src/Curves/Edwards/AffineProofs.v index 255d5e0a62..8816f6b930 100644 --- a/src/Curves/Edwards/AffineProofs.v +++ b/src/Curves/Edwards/AffineProofs.v @@ -1,9 +1,10 @@ Require Export Crypto.Spec.CompleteEdwardsCurve. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.ScalarMult Crypto.Util.Decidable. -Require Import Coq.Logic.Eqdep_dec. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. +From Coq Require Import Eqdep_dec. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. +From Coq Require Field_tac. Require Import Crypto.Util.Tuple Crypto.Util.Notations. Require Import Crypto.Util.Tactics.UniquePose. Require Import Crypto.Util.Tactics.DestructHead. diff --git a/src/Curves/Edwards/Pre.v b/src/Curves/Edwards/Pre.v index 9f5d5cfab3..7cc798a2a5 100644 --- a/src/Curves/Edwards/Pre.v +++ b/src/Curves/Edwards/Pre.v @@ -1,7 +1,7 @@ -Require Import Coq.Classes.Morphisms. Require Coq.Setoids.Setoid Crypto.Util.Relations. +From Coq Require Import Morphisms. Require Setoid Crypto.Util.Relations. Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Ring Crypto.Algebra.Field. Require Import Crypto.Util.Notations Crypto.Util.Decidable (*Crypto.Util.Tactics*). -Require Import Coq.PArith.BinPos. +From Coq Require Import BinPos. Section Edwards. Context {F eq zero one opp add sub mul inv div} diff --git a/src/Curves/Edwards/TwistIsomorphism.v b/src/Curves/Edwards/TwistIsomorphism.v index 9a9105bd0b..002f486251 100644 --- a/src/Curves/Edwards/TwistIsomorphism.v +++ b/src/Curves/Edwards/TwistIsomorphism.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Algebra.Hierarchy. Require Import Crypto.Algebra.Field. Require Import Crypto.Spec.CompleteEdwardsCurve. diff --git a/src/Curves/Edwards/XYZT/Basic.v b/src/Curves/Edwards/XYZT/Basic.v index fc69464f30..653ddbcf1a 100644 --- a/src/Curves/Edwards/XYZT/Basic.v +++ b/src/Curves/Edwards/XYZT/Basic.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Spec.CompleteEdwardsCurve Crypto.Curves.Edwards.AffineProofs. diff --git a/src/Curves/Edwards/XYZT/Precomputed.v b/src/Curves/Edwards/XYZT/Precomputed.v index 1f9dd3431a..f4389bcd4f 100644 --- a/src/Curves/Edwards/XYZT/Precomputed.v +++ b/src/Curves/Edwards/XYZT/Precomputed.v @@ -1,7 +1,7 @@ Require Import Crypto.Util.Decidable Crypto.Util.Notations Crypto.Algebra.Hierarchy. Require Import Crypto.Spec.CompleteEdwardsCurve Crypto.Curves.Edwards.XYZT.Basic. -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Tactics.BreakMatch. diff --git a/src/Curves/Edwards/XYZT/Readdition.v b/src/Curves/Edwards/XYZT/Readdition.v index 0d1ae68bb3..5de3a9d158 100644 --- a/src/Curves/Edwards/XYZT/Readdition.v +++ b/src/Curves/Edwards/XYZT/Readdition.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Spec.CompleteEdwardsCurve Crypto.Curves.Edwards.AffineProofs. Require Import Crypto.Curves.Edwards.XYZT.Basic. diff --git a/src/Curves/EdwardsMontgomery.v b/src/Curves/EdwardsMontgomery.v index 6c5423f468..d743175a94 100644 --- a/src/Curves/EdwardsMontgomery.v +++ b/src/Curves/EdwardsMontgomery.v @@ -1,4 +1,4 @@ -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinPosDef. Require Import Crypto.Algebra.Field. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.GlobalSettings. @@ -7,7 +7,7 @@ Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Spec.MontgomeryCurve Crypto.Curves.Montgomery.Affine. Require Import Crypto.Spec.CompleteEdwardsCurve Crypto.Curves.Edwards.AffineProofs. -Require Import Coq.setoid_ring.Field_theory. +From Coq Require Import Field_theory. Require Import Field_tac. Require Import UniquePose. diff --git a/src/Curves/EdwardsMontgomery25519.v b/src/Curves/EdwardsMontgomery25519.v index b5b1d7b5a6..b8af3ff7c5 100644 --- a/src/Curves/EdwardsMontgomery25519.v +++ b/src/Curves/EdwardsMontgomery25519.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. Local Open Scope Z_scope. +From Coq Require Import ZArith. Local Open Scope Z_scope. Require Import Crypto.Util.Decidable. Require Import Crypto.Spec.ModularArithmetic. Local Open Scope F_scope. Require Import Crypto.Curves.EdwardsMontgomery. Import M. diff --git a/src/Curves/Montgomery/Affine.v b/src/Curves/Montgomery/Affine.v index c7c77a125f..161c53053a 100644 --- a/src/Curves/Montgomery/Affine.v +++ b/src/Curves/Montgomery/Affine.v @@ -1,4 +1,4 @@ -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinPosDef. Require Import Crypto.Algebra.Field. Require Import Crypto.Util.GlobalSettings. Require Import Crypto.Util.Sum Crypto.Util.Prod. diff --git a/src/Curves/Montgomery/AffineInstances.v b/src/Curves/Montgomery/AffineInstances.v index 40bd154209..e76d76dc0c 100644 --- a/src/Curves/Montgomery/AffineInstances.v +++ b/src/Curves/Montgomery/AffineInstances.v @@ -1,10 +1,10 @@ -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinPosDef. Require Import Crypto.Algebra.Field. Require Import Crypto.Spec.MontgomeryCurve Crypto.Curves.Montgomery.Affine. Require Import Crypto.Spec.WeierstrassCurve Crypto.Curves.Weierstrass.Affine. Require Import Crypto.Curves.Weierstrass.AffineProofs. Require Import Crypto.Curves.Montgomery.AffineProofs. -Require Import Coq.Classes.RelationClasses. +From Coq Require Import RelationClasses. Module M. Section MontgomeryCurve. diff --git a/src/Curves/Montgomery/AffineProofs.v b/src/Curves/Montgomery/AffineProofs.v index 2de52c5200..c2b0c03676 100644 --- a/src/Curves/Montgomery/AffineProofs.v +++ b/src/Curves/Montgomery/AffineProofs.v @@ -1,4 +1,4 @@ -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinPosDef. Require Import Crypto.Algebra.Field. Require Import Crypto.Util.GlobalSettings. Require Import Crypto.Util.Sum Crypto.Util.Prod. diff --git a/src/Curves/Montgomery/XZ.v b/src/Curves/Montgomery/XZ.v index 237db72b4f..dbff298ac0 100644 --- a/src/Curves/Montgomery/XZ.v +++ b/src/Curves/Montgomery/XZ.v @@ -1,5 +1,5 @@ -Require Import Coq.PArith.BinPosDef. -Require Import Coq.ZArith.BinIntDef. +From Coq Require Import BinPosDef. +From Coq Require Import BinIntDef. Require Import Crypto.Algebra.Field. Require Import Crypto.Util.GlobalSettings Crypto.Util.Notations. Require Import Crypto.Util.Sum Crypto.Util.Prod Crypto.Util.LetIn. diff --git a/src/Curves/Montgomery/XZProofs.v b/src/Curves/Montgomery/XZProofs.v index 1b74dc98e9..9bc3247a27 100644 --- a/src/Curves/Montgomery/XZProofs.v +++ b/src/Curves/Montgomery/XZProofs.v @@ -15,9 +15,9 @@ Require Import Crypto.Util.Tactics.UniquePose. Require Import Crypto.Spec.MontgomeryCurve Crypto.Curves.Montgomery.Affine. Require Import Crypto.Curves.Montgomery.AffineInstances. Require Import Crypto.Curves.Montgomery.XZ BinPos. -Require Import Coq.Classes.Morphisms. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. Module M. Section MontgomeryCurve. @@ -264,7 +264,7 @@ Module M. Local Notation scalarmult := (@ScalarMult.scalarmult_ref Mpoint Madd M.zero Mopp). Import Crypto.Util.Loops. - Import Coq.ZArith.BinInt. + Import BinInt. Lemma to_x_inv00 (HFinv:Finv 0 = 0) x z : to_x (pair x z) = x * Finv z. Proof. t_fast; setoid_subst_rel Feq; rewrite ?HFinv in *; fsatz. Qed. diff --git a/src/Curves/TableMult/TableMult.v b/src/Curves/TableMult/TableMult.v index 7e682ae0ab..01e3cfa303 100644 --- a/src/Curves/TableMult/TableMult.v +++ b/src/Curves/TableMult/TableMult.v @@ -1,7 +1,7 @@ -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import Lia. -Require Import Coq.Sorting.Permutation. +From Coq Require Import Permutation. Import ListNotations. Local Open Scope Z_scope. diff --git a/src/Curves/Weierstrass/AffineProofs.v b/src/Curves/Weierstrass/AffineProofs.v index 2faac22ebd..60a61a2c23 100644 --- a/src/Curves/Weierstrass/AffineProofs.v +++ b/src/Curves/Weierstrass/AffineProofs.v @@ -1,9 +1,9 @@ -Require Import Coq.Numbers.BinNums. -Require Import Coq.Classes.Morphisms. +From Coq Require Import BinNums. +From Coq Require Import Morphisms. Require Import Crypto.Spec.WeierstrassCurve Crypto.Curves.Weierstrass.Affine. Require Import Crypto.Algebra.Field Crypto.Algebra.Hierarchy. Require Import Crypto.Util.Decidable Crypto.Util.Tactics.DestructHead Crypto.Util.Tactics.BreakMatch. -Require Import Coq.PArith.BinPos. +From Coq Require Import BinPos. Module W. Section W. diff --git a/src/Curves/Weierstrass/Jacobian/CoZ.v b/src/Curves/Weierstrass/Jacobian/CoZ.v index 2f05c63fdb..362450ce43 100644 --- a/src/Curves/Weierstrass/Jacobian/CoZ.v +++ b/src/Curves/Weierstrass/Jacobian/CoZ.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Spec.WeierstrassCurve. Require Import Crypto.Curves.Weierstrass.Affine Crypto.Curves.Weierstrass.AffineProofs. @@ -11,7 +11,7 @@ Require Import Crypto.Util.Tactics.SetoidSubst. Require Import Crypto.Util.Notations Crypto.Util.LetIn. Require Import Crypto.Util.Sum Crypto.Util.Prod Crypto.Util.Sigma. Require Import Crypto.Util.FsatzAutoLemmas. -Require Import Coq.PArith.BinPos. +From Coq Require Import BinPos. Module Jacobian. Section Co_Z. diff --git a/src/Curves/Weierstrass/Jacobian/Jacobian.v b/src/Curves/Weierstrass/Jacobian/Jacobian.v index e1ff97c06d..a6bbd896fd 100644 --- a/src/Curves/Weierstrass/Jacobian/Jacobian.v +++ b/src/Curves/Weierstrass/Jacobian/Jacobian.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Spec.WeierstrassCurve. Require Import Curves.Weierstrass.Affine. diff --git a/src/Curves/Weierstrass/Jacobian/ScalarMult.v b/src/Curves/Weierstrass/Jacobian/ScalarMult.v index e9dfd24b7f..e2bf896ea6 100644 --- a/src/Curves/Weierstrass/Jacobian/ScalarMult.v +++ b/src/Curves/Weierstrass/Jacobian/ScalarMult.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Spec.WeierstrassCurve Crypto.Algebra.ScalarMult. Require Import Crypto.Curves.Weierstrass.Jacobian.Jacobian. Require Import Crypto.Curves.Weierstrass.Affine Crypto.Curves.Weierstrass.AffineProofs. @@ -17,8 +17,8 @@ Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.ZUtil.Shift. Require Import Crypto.Util.ZUtil.Peano. Require Import Crypto.Util.Tuple. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Module Z. (* Note: ideally we would contribute this to Coq *) diff --git a/src/Demo.v b/src/Demo.v index 19d8aee26f..b416c06958 100644 --- a/src/Demo.v +++ b/src/Demo.v @@ -1,9 +1,10 @@ (* Following http://adam.chlipala.net/theses/andreser.pdf chapter 3 *) -Require Import Coq.ZArith.ZArith Coq.micromega.Lia Crypto.Algebra.Nsatz. +From Coq Require Import ZArith Lia. +Require Import Crypto.Algebra.Nsatz. Require Import Crypto.Util.Tactics.UniquePose Crypto.Util.Decidable. Require Import Crypto.Util.Tuple Crypto.Util.Prod Crypto.Util.LetIn. Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.NatUtil. -Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil. +Require Import QArith_base Qround Crypto.Util.QUtil. Require Import Crypto.Algebra.Ring Crypto.Util.Decidable.Bool2Prop. Import ListNotations. Local Open Scope Z_scope. diff --git a/src/Fancy/Barrett256.v b/src/Fancy/Barrett256.v index 810b8cf0c0..7a933a1913 100644 --- a/src/Fancy/Barrett256.v +++ b/src/Fancy/Barrett256.v @@ -1,7 +1,7 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.derive.Derive. -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. Import ListNotations. +From Coq Require Import Bool. +From Coq Require Import Derive. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Import ListNotations. Require Import Crypto.COperationSpecifications. Import COperationSpecifications.BarrettReduction. Require Import Rewriter.Language.Language. Import Language.Compilers. Require Import Crypto.Language.API. Import Language.API.Compilers. diff --git a/src/Fancy/Compiler.v b/src/Fancy/Compiler.v index 8cd0ad9e1a..75baf6cef1 100644 --- a/src/Fancy/Compiler.v +++ b/src/Fancy/Compiler.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. Import ListNotations. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Import ListNotations. Require Import Rewriter.Language.Wf. Import Language.Wf.Compilers. Require Import Rewriter.Language.Inversion. Import Language.Inversion.Compilers. Require Import Crypto.Language.API. Import Language.API.Compilers. diff --git a/src/Fancy/Montgomery256.v b/src/Fancy/Montgomery256.v index 2a93034043..73edabee2f 100644 --- a/src/Fancy/Montgomery256.v +++ b/src/Fancy/Montgomery256.v @@ -1,7 +1,7 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.derive.Derive. -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Lists.List. Import ListNotations. +From Coq Require Import Bool. +From Coq Require Import Derive. +From Coq Require Import ZArith Lia. +From Coq Require Import List. Import ListNotations. Require Import Rewriter.Language.Language. Import Language.Compilers. Require Import Crypto.Language.API. Import Language.API.Compilers. Require Import Rewriter.Language.Wf. Import Language.Wf.Compilers. diff --git a/src/Fancy/Prod.v b/src/Fancy/Prod.v index f421bab684..0e353cf6c9 100644 --- a/src/Fancy/Prod.v +++ b/src/Fancy/Prod.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Lists.List. Import ListNotations. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import List. Import ListNotations. Require Import Crypto.Algebra.Ring. (* for ring_simplify_subterms *) Require Import Crypto.Fancy.Spec. Import Spec.Registers. Require Import Crypto.Fancy.Compiler. diff --git a/src/Fancy/Spec.v b/src/Fancy/Spec.v index f8d2cc644a..e6f635c583 100644 --- a/src/Fancy/Spec.v +++ b/src/Fancy/Spec.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. Import ListNotations. +From Coq Require Import ZArith. +From Coq Require Import List. Import ListNotations. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tuple. Require Import Crypto.Util.Notations. diff --git a/src/Language/APINotations.v b/src/Language/APINotations.v index 9917c0e2e8..fadafb2570 100644 --- a/src/Language/APINotations.v +++ b/src/Language/APINotations.v @@ -1,8 +1,8 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.Bool.Bool. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. +From Coq Require Import ZArith. +From Coq Require Import FMapPositive. +From Coq Require Import Bool. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. Require Import Ltac2.Ltac2. Require Import Ltac2.Printf. Require Import Crypto.Language.PreExtra. diff --git a/src/Language/IdentifierParameters.v b/src/Language/IdentifierParameters.v index 20c87b3c89..626a7716a3 100644 --- a/src/Language/IdentifierParameters.v +++ b/src/Language/IdentifierParameters.v @@ -1,5 +1,5 @@ -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import ZArith. Require Import Crypto.Util.ListUtil Coq.Lists.List. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZUtil.Definitions. diff --git a/src/Language/PreExtra.v b/src/Language/PreExtra.v index a06230d5d9..345bc89a38 100644 --- a/src/Language/PreExtra.v +++ b/src/Language/PreExtra.v @@ -1,5 +1,5 @@ (** Definitions for use in pre-reified rewriter rules *) -Require Import Coq.ZArith.BinInt. +From Coq Require Import BinInt. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. Require Import Crypto.Util.ZUtil.Definitions. diff --git a/src/MiscCompilerPasses.v b/src/MiscCompilerPasses.v index b4e7c64e60..88ae6949d2 100644 --- a/src/MiscCompilerPasses.v +++ b/src/MiscCompilerPasses.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.FSets.FMapPositive. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import FMapPositive. Require Import Crypto.Util.ListUtil Coq.Lists.List. Require Import Rewriter.Language.Language. Require Import Crypto.Util.LetIn. diff --git a/src/MiscCompilerPassesProofs.v b/src/MiscCompilerPassesProofs.v index 569bb993a8..7abb8595fd 100644 --- a/src/MiscCompilerPassesProofs.v +++ b/src/MiscCompilerPassesProofs.v @@ -1,8 +1,8 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.Classes.Morphisms. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.FSets.FMapPositive. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Morphisms. +From Coq Require Import MSetPositive. +From Coq Require Import FMapPositive. Require Import Rewriter.Language.Language. Require Import Rewriter.Language.Inversion. Require Import Rewriter.Language.Wf. diff --git a/src/MiscCompilerPassesProofsExtra.v b/src/MiscCompilerPassesProofsExtra.v index 4e8030f9c4..e2273c6780 100644 --- a/src/MiscCompilerPassesProofsExtra.v +++ b/src/MiscCompilerPassesProofsExtra.v @@ -1,8 +1,8 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.Classes.Morphisms. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.FSets.FMapPositive. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Morphisms. +From Coq Require Import MSetPositive. +From Coq Require Import FMapPositive. Require Import Rewriter.Language.Language. Require Import Rewriter.Language.Inversion. Require Import Crypto.Language.API. diff --git a/src/PerfTesting/PerfTestPrint.v b/src/PerfTesting/PerfTestPrint.v index b1648e35f9..3a8444852d 100644 --- a/src/PerfTesting/PerfTestPrint.v +++ b/src/PerfTesting/PerfTestPrint.v @@ -1,5 +1,5 @@ (* This is mostly for testing the performance of variations of [Print] for Coq's bench, a la what company-coq uses *) -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Time Require Import Crypto.Everything. Time Redirect "log" Print Grammar tactic. Time Redirect "log" Print Grammar constr. diff --git a/src/PerfTesting/PerfTestSearch.v b/src/PerfTesting/PerfTestSearch.v index 4683f29097..b48a48b65d 100644 --- a/src/PerfTesting/PerfTestSearch.v +++ b/src/PerfTesting/PerfTestSearch.v @@ -1,5 +1,5 @@ (* This is mostly for testing the performance of [Search] for Coq's bench *) -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Time Require Import Crypto.Everything. #[local] Set Search Output Name Only. Time Redirect "log" Search -"____". diff --git a/src/PerfTesting/PerfTestSearchPattern.v b/src/PerfTesting/PerfTestSearchPattern.v index 1903c74e6b..01195e9469 100644 --- a/src/PerfTesting/PerfTestSearchPattern.v +++ b/src/PerfTesting/PerfTestSearchPattern.v @@ -1,5 +1,5 @@ (* This is mostly for testing the performance of [Search] for Coq's bench *) -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Time Require Import Crypto.Everything. #[local] Set Search Output Name Only. Time Redirect "log" SearchPattern _. diff --git a/src/PushButtonSynthesis/BYInversionReificationCache.v b/src/PushButtonSynthesis/BYInversionReificationCache.v index 739ce9d953..933660a0ce 100644 --- a/src/PushButtonSynthesis/BYInversionReificationCache.v +++ b/src/PushButtonSynthesis/BYInversionReificationCache.v @@ -1,6 +1,6 @@ (** * Push-Button Synthesis of Bernstein-Yang Inversion: Reification Cache *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. +From Coq Require Import ZArith. +From Coq Require Import Derive. Require Import Crypto.Util.Tactics.Head. Require Import Crypto.Util.ZUtil.Pow. Require Import Crypto.Arithmetic.Core. diff --git a/src/PushButtonSynthesis/BarrettReduction.v b/src/PushButtonSynthesis/BarrettReduction.v index 445c10257e..d68fd18d2c 100644 --- a/src/PushButtonSynthesis/BarrettReduction.v +++ b/src/PushButtonSynthesis/BarrettReduction.v @@ -1,9 +1,9 @@ (** * Push-Button Synthesis of Barrett Reduction *) -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.derive.Derive. -Require Import Coq.micromega.Lia. +From Coq Require Import String. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Derive. +From Coq Require Import Lia. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ZRange. diff --git a/src/PushButtonSynthesis/BarrettReductionReificationCache.v b/src/PushButtonSynthesis/BarrettReductionReificationCache.v index 2526b79b1e..4e17a7a675 100644 --- a/src/PushButtonSynthesis/BarrettReductionReificationCache.v +++ b/src/PushButtonSynthesis/BarrettReductionReificationCache.v @@ -1,7 +1,7 @@ (** * Push-Button Synthesis of Barrett Reduction: Reification Cache *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import Derive. +From Coq Require Import List. Require Import Crypto.Util.ListUtil. Require Import Crypto.Arithmetic.BarrettReduction. Require Import Crypto.PushButtonSynthesis.ReificationCache. diff --git a/src/PushButtonSynthesis/BaseConversion.v b/src/PushButtonSynthesis/BaseConversion.v index 8cfd82fbed..a7fc8b88e1 100644 --- a/src/PushButtonSynthesis/BaseConversion.v +++ b/src/PushButtonSynthesis/BaseConversion.v @@ -1,11 +1,11 @@ (** * Push-Button Synthesis of Unsaturated Solinas *) -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Lists.List. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import List. +From Coq Require Import QArith_base Qround. +From Coq Require Import Derive. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.FoldBool. diff --git a/src/PushButtonSynthesis/BaseConversionReificationCache.v b/src/PushButtonSynthesis/BaseConversionReificationCache.v index df38c7edc3..aca3294386 100644 --- a/src/PushButtonSynthesis/BaseConversionReificationCache.v +++ b/src/PushButtonSynthesis/BaseConversionReificationCache.v @@ -1,6 +1,6 @@ (** * Push-Button Synthesis of Unsaturated Solinas: Reification Cache *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. +From Coq Require Import ZArith. +From Coq Require Import Derive. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.BaseConversion. Require Import Crypto.PushButtonSynthesis.ReificationCache. diff --git a/src/PushButtonSynthesis/DettmanMultiplication.v b/src/PushButtonSynthesis/DettmanMultiplication.v index 78859ad1cf..5e7d380b1d 100644 --- a/src/PushButtonSynthesis/DettmanMultiplication.v +++ b/src/PushButtonSynthesis/DettmanMultiplication.v @@ -1,11 +1,11 @@ (** * Push-Button Synthesis of Dettman Multiplication *) -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Lists.List. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import List. +From Coq Require Import QArith_base Qround. +From Coq Require Import Derive. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.FoldBool. diff --git a/src/PushButtonSynthesis/DettmanMultiplicationReificationCache.v b/src/PushButtonSynthesis/DettmanMultiplicationReificationCache.v index a992e7d32d..098de2b0a0 100644 --- a/src/PushButtonSynthesis/DettmanMultiplicationReificationCache.v +++ b/src/PushButtonSynthesis/DettmanMultiplicationReificationCache.v @@ -1,5 +1,5 @@ (** * Push-Button Synthesis of Bitcoin Multiplication: Reification Cache *) -Require Import Coq.derive.Derive. +From Coq Require Import Derive. Require Import Crypto.PushButtonSynthesis.ReificationCache. Require Import Crypto.Arithmetic.DettmanMultiplication. diff --git a/src/PushButtonSynthesis/FancyMontgomeryReduction.v b/src/PushButtonSynthesis/FancyMontgomeryReduction.v index f0e065cf58..1f1eac0d41 100644 --- a/src/PushButtonSynthesis/FancyMontgomeryReduction.v +++ b/src/PushButtonSynthesis/FancyMontgomeryReduction.v @@ -1,9 +1,9 @@ (** * Push-Button Synthesis of Montgomery Reduction *) -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Lists.List. -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import List. +From Coq Require Import Derive. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ZRange. diff --git a/src/PushButtonSynthesis/FancyMontgomeryReductionReificationCache.v b/src/PushButtonSynthesis/FancyMontgomeryReductionReificationCache.v index 4320aee452..6025280d13 100644 --- a/src/PushButtonSynthesis/FancyMontgomeryReductionReificationCache.v +++ b/src/PushButtonSynthesis/FancyMontgomeryReductionReificationCache.v @@ -1,6 +1,6 @@ (** * Push-Button Synthesis of fancy mongomery reduction : Reification Cache *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. +From Coq Require Import ZArith. +From Coq Require Import Derive. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.FancyMontgomeryReduction. Require Import Crypto.PushButtonSynthesis.ReificationCache. diff --git a/src/PushButtonSynthesis/InvertHighLow.v b/src/PushButtonSynthesis/InvertHighLow.v index f7deb41456..51e20ecd1b 100644 --- a/src/PushButtonSynthesis/InvertHighLow.v +++ b/src/PushButtonSynthesis/InvertHighLow.v @@ -1,6 +1,6 @@ (** * Push-Button Synthesis fancy argument definitions *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import List. Local Open Scope Z_scope. Section with_wordmax. diff --git a/src/PushButtonSynthesis/Primitives.v b/src/PushButtonSynthesis/Primitives.v index 2eaf928692..61dd424a48 100644 --- a/src/PushButtonSynthesis/Primitives.v +++ b/src/PushButtonSynthesis/Primitives.v @@ -1,11 +1,11 @@ (** * Push-Button Synthesis of Primitives *) -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Lists.List. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import List. +From Coq Require Import QArith_base Qround. +From Coq Require Import Derive. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.OptionList. diff --git a/src/PushButtonSynthesis/ReificationCache.v b/src/PushButtonSynthesis/ReificationCache.v index 6652cef8d1..762b1f0dcf 100644 --- a/src/PushButtonSynthesis/ReificationCache.v +++ b/src/PushButtonSynthesis/ReificationCache.v @@ -2,7 +2,7 @@ (** This file defines the cache that holds reified versions of operations, as well as the tactics that reify and apply things from the cache. *) -Require Import Coq.Relations.Relation_Definitions. +From Coq Require Import Relation_Definitions. Require Import Crypto.Util.Tactics.Head. Require Import Crypto.Util.Tactics.SubstEvars. Require Import Crypto.Language.API. diff --git a/src/PushButtonSynthesis/SaturatedSolinas.v b/src/PushButtonSynthesis/SaturatedSolinas.v index 69355e4f86..0e0469eda7 100644 --- a/src/PushButtonSynthesis/SaturatedSolinas.v +++ b/src/PushButtonSynthesis/SaturatedSolinas.v @@ -1,11 +1,11 @@ (** * Push-Button Synthesis of Saturated Solinas *) -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Lists.List. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import List. +From Coq Require Import QArith_base Qround. +From Coq Require Import Derive. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.FoldBool. diff --git a/src/PushButtonSynthesis/SaturatedSolinasReificationCache.v b/src/PushButtonSynthesis/SaturatedSolinasReificationCache.v index 7a203a6fa6..af94b14784 100644 --- a/src/PushButtonSynthesis/SaturatedSolinasReificationCache.v +++ b/src/PushButtonSynthesis/SaturatedSolinasReificationCache.v @@ -1,7 +1,7 @@ (** * Push-Button Synthesis of Saturated Solinas: Reification Cache *) -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. +From Coq Require Import QArith_base Qround. +From Coq Require Import ZArith. +From Coq Require Import Derive. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. Require Import Crypto.Arithmetic.Saturated. diff --git a/src/PushButtonSynthesis/SmallExamples.v b/src/PushButtonSynthesis/SmallExamples.v index 24cba6f64f..98f3afcae3 100644 --- a/src/PushButtonSynthesis/SmallExamples.v +++ b/src/PushButtonSynthesis/SmallExamples.v @@ -1,7 +1,7 @@ (** * Push-Button Synthesis Examples *) -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. +From Coq Require Import String. +From Coq Require Import ZArith. +From Coq Require Import List. Require Import Crypto.Util.ZRange. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. diff --git a/src/PushButtonSynthesis/SolinasReduction.v b/src/PushButtonSynthesis/SolinasReduction.v index 3066dbe357..0175dfca93 100644 --- a/src/PushButtonSynthesis/SolinasReduction.v +++ b/src/PushButtonSynthesis/SolinasReduction.v @@ -1,11 +1,11 @@ (** * Push-Button Synthesis of Saturated Reduction *) -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Lists.List. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import List. +From Coq Require Import QArith_base Qround. +From Coq Require Import Derive. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.FoldBool. diff --git a/src/PushButtonSynthesis/SolinasReductionReificationCache.v b/src/PushButtonSynthesis/SolinasReductionReificationCache.v index f956c54381..2e8af83108 100644 --- a/src/PushButtonSynthesis/SolinasReductionReificationCache.v +++ b/src/PushButtonSynthesis/SolinasReductionReificationCache.v @@ -1,9 +1,9 @@ (** * Push-Button Synthesis of Solinas Reduction: Reification Cache *) -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.Init.Nat. -Require Import Coq.ZArith.ZArith. -Require Import Coq.ZArith.BinInt. -Require Import Coq.derive.Derive. +From Coq Require Import QArith_base Qround. +From Coq Require Import Nat. +From Coq Require Import ZArith. +From Coq Require Import BinInt. +From Coq Require Import Derive. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. Require Import Crypto.Arithmetic.Saturated. @@ -11,8 +11,8 @@ Require Import Crypto.Arithmetic.SolinasReduction. Require Import Crypto.PushButtonSynthesis.ReificationCache. Require Import Crypto.Language.IdentifierParameters. -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import ZArith. Require Import Crypto.Util.ListUtil Coq.Lists.List. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZUtil.Definitions. diff --git a/src/PushButtonSynthesis/UnsaturatedSolinas.v b/src/PushButtonSynthesis/UnsaturatedSolinas.v index 5f53f965ed..8304c7a27f 100644 --- a/src/PushButtonSynthesis/UnsaturatedSolinas.v +++ b/src/PushButtonSynthesis/UnsaturatedSolinas.v @@ -1,11 +1,11 @@ (** * Push-Button Synthesis of Unsaturated Solinas *) -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Lists.List. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import List. +From Coq Require Import QArith_base Qround. +From Coq Require Import Derive. Require Crypto.TAPSort. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. diff --git a/src/PushButtonSynthesis/UnsaturatedSolinasReificationCache.v b/src/PushButtonSynthesis/UnsaturatedSolinasReificationCache.v index 6a01c49bd7..9b412e7fa9 100644 --- a/src/PushButtonSynthesis/UnsaturatedSolinasReificationCache.v +++ b/src/PushButtonSynthesis/UnsaturatedSolinasReificationCache.v @@ -1,6 +1,6 @@ (** * Push-Button Synthesis of Unsaturated Solinas: Reification Cache *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. +From Coq Require Import ZArith. +From Coq Require Import Derive. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.Freeze. Require Import Crypto.Arithmetic.ModOps. diff --git a/src/PushButtonSynthesis/WordByWordMontgomery.v b/src/PushButtonSynthesis/WordByWordMontgomery.v index 74888dc11e..6694b4bfd6 100644 --- a/src/PushButtonSynthesis/WordByWordMontgomery.v +++ b/src/PushButtonSynthesis/WordByWordMontgomery.v @@ -1,12 +1,12 @@ (** * Push-Button Synthesis of Word-By-Word Montgomery *) -Require Import Coq.Strings.String. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Lists.List. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.Program.Tactics. (* For WBW Montgomery proofs *) -Require Import Coq.derive.Derive. +From Coq Require Import String. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import List. +From Coq Require Import QArith_base Qround. +From Coq.Program Require Import Tactics. (* For WBW Montgomery proofs *) +From Coq Require Import Derive. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.FoldBool. diff --git a/src/PushButtonSynthesis/WordByWordMontgomeryReificationCache.v b/src/PushButtonSynthesis/WordByWordMontgomeryReificationCache.v index 4bead2b874..aaca891d91 100644 --- a/src/PushButtonSynthesis/WordByWordMontgomeryReificationCache.v +++ b/src/PushButtonSynthesis/WordByWordMontgomeryReificationCache.v @@ -1,6 +1,6 @@ (** * Push-Button Synthesis of Word-By-Word Montgomery: Reification Cache *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.derive.Derive. +From Coq Require Import ZArith. +From Coq Require Import Derive. Require Import Crypto.Util.Tactics.Head. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.Freeze. diff --git a/src/Rewriter/Passes/AddAssocLeft.v b/src/Rewriter/Passes/AddAssocLeft.v index af79b735e5..2d33e427f5 100644 --- a/src/Rewriter/Passes/AddAssocLeft.v +++ b/src/Rewriter/Passes/AddAssocLeft.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/Passes/Arith.v b/src/Rewriter/Passes/Arith.v index a749fa8532..4136bcedae 100644 --- a/src/Rewriter/Passes/Arith.v +++ b/src/Rewriter/Passes/Arith.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/Passes/MulSplit.v b/src/Rewriter/Passes/MulSplit.v index a8d2d5dc89..ceac733cea 100644 --- a/src/Rewriter/Passes/MulSplit.v +++ b/src/Rewriter/Passes/MulSplit.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/Passes/MultiRetSplit.v b/src/Rewriter/Passes/MultiRetSplit.v index a7ee558a81..3cb73088f5 100644 --- a/src/Rewriter/Passes/MultiRetSplit.v +++ b/src/Rewriter/Passes/MultiRetSplit.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/Passes/NoSelect.v b/src/Rewriter/Passes/NoSelect.v index 7faf179bb4..d83a642edf 100644 --- a/src/Rewriter/Passes/NoSelect.v +++ b/src/Rewriter/Passes/NoSelect.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/Passes/RelaxBitwidthAdcSbb.v b/src/Rewriter/Passes/RelaxBitwidthAdcSbb.v index 1e8e2c2535..643f6f3271 100644 --- a/src/Rewriter/Passes/RelaxBitwidthAdcSbb.v +++ b/src/Rewriter/Passes/RelaxBitwidthAdcSbb.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/Passes/Test.v b/src/Rewriter/Passes/Test.v index 6ef67828f2..40f1ae4941 100644 --- a/src/Rewriter/Passes/Test.v +++ b/src/Rewriter/Passes/Test.v @@ -44,7 +44,7 @@ Module Compilers. End Compilers. Module Example. - Import Coq.ZArith.ZArith. + Import ZArith. Import Compilers.RewriteRules. Import Crypto.Util.ZRange. Import Crypto.Language.PreExtra. diff --git a/src/Rewriter/Passes/ToFancy.v b/src/Rewriter/Passes/ToFancy.v index 648bbf8b6a..3a6ce3d310 100644 --- a/src/Rewriter/Passes/ToFancy.v +++ b/src/Rewriter/Passes/ToFancy.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/Passes/ToFancyWithCasts.v b/src/Rewriter/Passes/ToFancyWithCasts.v index e8a7d916d0..13dae2c81a 100644 --- a/src/Rewriter/Passes/ToFancyWithCasts.v +++ b/src/Rewriter/Passes/ToFancyWithCasts.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZRange. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. diff --git a/src/Rewriter/Passes/UnfoldValueBarrier.v b/src/Rewriter/Passes/UnfoldValueBarrier.v index d93e9ad050..608f7dc7ef 100644 --- a/src/Rewriter/Passes/UnfoldValueBarrier.v +++ b/src/Rewriter/Passes/UnfoldValueBarrier.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Rewriter.Language.Language. Require Import Crypto.Language.API. Require Import Rewriter.Language.Wf. diff --git a/src/Rewriter/PerfTesting/Core.v b/src/Rewriter/PerfTesting/Core.v index fc59576980..dc626c2eb3 100644 --- a/src/Rewriter/PerfTesting/Core.v +++ b/src/Rewriter/PerfTesting/Core.v @@ -1,7 +1,7 @@ -Require Export Coq.ZArith.ZArith. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Export Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Export ZArith. +From Coq Require Import QArith_base Qround. +From Coq Require Export String. +From Coq Require Import List. Require Crypto.ArithmeticCPS.Core. Require Crypto.ArithmeticCPS.ModOps. Require Crypto.ArithmeticCPS.Saturated. diff --git a/src/Rewriter/PerfTesting/StandaloneOCamlMain.v b/src/Rewriter/PerfTesting/StandaloneOCamlMain.v index edbef9d3e3..278c849f04 100644 --- a/src/Rewriter/PerfTesting/StandaloneOCamlMain.v +++ b/src/Rewriter/PerfTesting/StandaloneOCamlMain.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Export Crypto.StandaloneOCamlMain. Require Import Crypto.Rewriter.PerfTesting.Core. Require Import Crypto.Util.Notations. diff --git a/src/Rewriter/Rules.v b/src/Rewriter/Rules.v index 61cf959fcf..4af33b1520 100644 --- a/src/Rewriter/Rules.v +++ b/src/Rewriter/Rules.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.ListUtil.FoldBool. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. diff --git a/src/Rewriter/RulesProofs.v b/src/Rewriter/RulesProofs.v index 1eb8f63004..e8d5036cbb 100644 --- a/src/Rewriter/RulesProofs.v +++ b/src/Rewriter/RulesProofs.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith Coq.ZArith.Znumtheory. +From Coq Require Import Lia. +From Coq Require Import ZArith Znumtheory. Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.ListUtil.FoldBool. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. diff --git a/src/Rewriter/TestRules.v b/src/Rewriter/TestRules.v index 404a4bf881..480e301107 100644 --- a/src/Rewriter/TestRules.v +++ b/src/Rewriter/TestRules.v @@ -1,5 +1,5 @@ (** A version of [Rules.v] for testing *) -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.ListUtil.FoldBool. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. diff --git a/src/SlowPrimeSynthesisExamples.v b/src/SlowPrimeSynthesisExamples.v index a38603e14f..755dc99eaf 100644 --- a/src/SlowPrimeSynthesisExamples.v +++ b/src/SlowPrimeSynthesisExamples.v @@ -1,9 +1,9 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.QArith.QArith. -Require Import Coq.QArith.Qround. -Require Import Coq.Strings.String. -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import QArith. +From Coq Require Import Qround. +From Coq Require Import String. +From Coq Require Import Derive. +From Coq Require Import List. Require Import Crypto.Util.LetIn. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZUtil.Zselect. diff --git a/src/Spec/Curve25519.v b/src/Spec/Curve25519.v index 9ee465b880..e01288fde3 100644 --- a/src/Spec/Curve25519.v +++ b/src/Spec/Curve25519.v @@ -1,4 +1,4 @@ -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinPosDef. Require Import Spec.ModularArithmetic. Local Open Scope positive_scope. @@ -10,7 +10,7 @@ Notation twist_order := (4*l2). Lemma orders_match : (2*(p + 1) - order = twist_order)%Z. Proof. exact eq_refl. Qed. -Require Import Coq.ZArith.Znumtheory Coq.Lists.List. Import ListNotations. +From Coq Require Import Znumtheory List. Import ListNotations. From Coqprime.PrimalityTest Require Import Pocklington PocklingtonCertificat. Lemma prime_p : prime p. diff --git a/src/Spec/ModularArithmetic.v b/src/Spec/ModularArithmetic.v index 11e42d2b39..6315c1ca4c 100644 --- a/src/Spec/ModularArithmetic.v +++ b/src/Spec/ModularArithmetic.v @@ -1,8 +1,8 @@ -Require Import Coq.ZArith.BinIntDef. -Require Import Coq.NArith.BinNatDef. -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinIntDef. +From Coq Require Import BinNatDef. +From Coq Require Import BinPosDef. -Require Coq.ZArith.Znumtheory Coq.Numbers.BinNums. +From Coq Require Znumtheory BinNums. Require Crypto.Arithmetic.ModularArithmeticPre. diff --git a/src/Spec/Test/X25519.v b/src/Spec/Test/X25519.v index 934b20a39c..2617cd8e90 100644 --- a/src/Spec/Test/X25519.v +++ b/src/Spec/Test/X25519.v @@ -1,9 +1,9 @@ (* Test vectors from , with hex values converted to decimal using python like this: > int.from_bytes(binascii.unhexlify('deadbeef'), 'little') *) -Require Import Coq.NArith.BinNatDef. -Require Import Coq.ZArith.BinIntDef. -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinNatDef. +From Coq Require Import BinIntDef. +From Coq Require Import BinPosDef. Require Import Spec.ModularArithmetic Spec.Curve25519 Spec.MxDH Crypto.Util.Decidable. Definition cswap {T} (swap:bool) (a b:T) := if swap then (b, a) else (a, b). Definition monty s : F p -> F p := @MxDH.montladder _ F.zero F.one F.add F.sub F.mul F.inv M.a24 cswap 255 (BinNat.N.testbit_nat s). diff --git a/src/StandaloneDebuggingExamples.v b/src/StandaloneDebuggingExamples.v index 4016d40f1c..81c6fe94dc 100644 --- a/src/StandaloneDebuggingExamples.v +++ b/src/StandaloneDebuggingExamples.v @@ -1,6 +1,6 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import Ascii. +From Coq Require Import String. Require Crypto.Util.Strings.String. Require Import Crypto.CLI. Require Import Crypto.Util.Notations. @@ -9,7 +9,7 @@ Import ListNotations. Local Open Scope string_scope. Module debugging_no_asm. Import StandaloneOCamlMain.UnsaturatedSolinas. - Import Coq.ZArith.ZArith. + Import ZArith. Open Scope Z_scope. Goal True. pose main as v. @@ -117,7 +117,7 @@ Module debugging_typedef_bounds. clearbody k; subst k. cbv beta iota zeta delta [ForExtraction.UnsaturatedSolinas.PipelineMain ForExtraction.Parameterized.PipelineMain] in v. vm_compute Arg.parse_argv in v. - Import Coq.ZArith.ZArith. + Import ZArith. Open Scope Z_scope. cbv beta iota in v. vm_compute Arg.split_type_of_list' in v. diff --git a/src/StandaloneHaskellMain.v b/src/StandaloneHaskellMain.v index ac897510e8..98db82aa3a 100644 --- a/src/StandaloneHaskellMain.v +++ b/src/StandaloneHaskellMain.v @@ -1,8 +1,8 @@ -Require Export Coq.extraction.Extraction. -Require Export Coq.extraction.ExtrHaskellBasic. -Require Export Coq.extraction.ExtrHaskellString. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Export Extraction. +From Coq Require Export ExtrHaskellBasic. +From Coq Require Export ExtrHaskellString. +From Coq Require Import List. +From Coq Require Import String. Require Crypto.Util.Strings.String. Require Import Crypto.CLI. Require Import Crypto.Util.Notations. diff --git a/src/StandaloneJsOfOCamlMain.v b/src/StandaloneJsOfOCamlMain.v index 1cef5d59b7..0da011ee74 100644 --- a/src/StandaloneJsOfOCamlMain.v +++ b/src/StandaloneJsOfOCamlMain.v @@ -1,9 +1,9 @@ -Require Export Coq.extraction.Extraction. -Require Export Coq.extraction.ExtrOcamlBasic. -Require Export Coq.extraction.ExtrOcamlString. -Require Import Coq.Lists.List. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. +From Coq Require Export Extraction. +From Coq Require Export ExtrOcamlBasic. +From Coq Require Export ExtrOcamlString. +From Coq Require Import List. +From Coq Require Import Ascii. +From Coq Require Import String. Require Crypto.Util.Strings.String. Require Import Crypto.CLI. Require Import Crypto.StandaloneMonadicUtils. diff --git a/src/StandaloneMonadicUtils.v b/src/StandaloneMonadicUtils.v index 7eb76884f5..e122c8ae8d 100644 --- a/src/StandaloneMonadicUtils.v +++ b/src/StandaloneMonadicUtils.v @@ -1,6 +1,6 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import Ascii. +From Coq Require Import String. Require Crypto.Util.Strings.String. Require Import Crypto.CLI. Require Import Crypto.Util.Notations. diff --git a/src/StandaloneOCamlMain.v b/src/StandaloneOCamlMain.v index 9c7710a56f..14d901698e 100644 --- a/src/StandaloneOCamlMain.v +++ b/src/StandaloneOCamlMain.v @@ -1,9 +1,9 @@ -Require Export Coq.extraction.Extraction. -Require Export Coq.extraction.ExtrOcamlBasic. -Require Export Coq.extraction.ExtrOcamlString. -Require Import Coq.Lists.List. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. +From Coq Require Export Extraction. +From Coq Require Export ExtrOcamlBasic. +From Coq Require Export ExtrOcamlString. +From Coq Require Import List. +From Coq Require Import Ascii. +From Coq Require Import String. Require Crypto.Util.Strings.String. Require Import Crypto.CLI. Require Import Crypto.Util.Notations. diff --git a/src/Stringification/C.v b/src/Stringification/C.v index 490047d62c..a317b4fbb4 100644 --- a/src/Stringification/C.v +++ b/src/Stringification/C.v @@ -1,10 +1,10 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.Strings.String. -Require Import Coq.Strings.Ascii. -Require Import Coq.Bool.Bool. -Require Import Coq.Strings.HexString. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import FMapPositive. +From Coq Require Import String. +From Coq Require Import Ascii. +From Coq Require Import Bool. +From Coq Require Import HexString. Require Import Crypto.Util.ListUtil Coq.Lists.List. Require Crypto.Util.Strings.String. Require Import Crypto.Util.Strings.Decimal. diff --git a/src/Stringification/Go.v b/src/Stringification/Go.v index 246450a0d5..984c335546 100644 --- a/src/Stringification/Go.v +++ b/src/Stringification/Go.v @@ -1,5 +1,5 @@ -From Coq Require Import ZArith.ZArith MSets.MSetPositive FSets.FMapPositive - Strings.String Strings.Ascii Bool.Bool Lists.List Strings.HexString. +From Coq Require Import ZArith MSetPositive FMapPositive + String Ascii Bool List HexString. From Crypto.Util Require Import ListUtil Strings.String Strings.Decimal Strings.Show diff --git a/src/Stringification/IR.v b/src/Stringification/IR.v index 2cdd2899c2..badd424fff 100644 --- a/src/Stringification/IR.v +++ b/src/Stringification/IR.v @@ -1,10 +1,10 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.Strings.String. -Require Import Coq.Strings.Ascii. -Require Import Coq.Bool.Bool. -Require Import Coq.Strings.HexString. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import FMapPositive. +From Coq Require Import String. +From Coq Require Import Ascii. +From Coq Require Import Bool. +From Coq Require Import HexString. Require Import Crypto.Util.ListUtil Coq.Lists.List. Require Crypto.Util.Strings.String. Require Import Crypto.Util.Strings.Decimal. diff --git a/src/Stringification/JSON.v b/src/Stringification/JSON.v index a91952278a..ea2cd58e7a 100644 --- a/src/Stringification/JSON.v +++ b/src/Stringification/JSON.v @@ -1,5 +1,5 @@ -From Coq Require Import ZArith.ZArith MSets.MSetPositive FSets.FMapPositive - Strings.String Strings.Ascii Bool.Bool Lists.List Strings.HexString. +From Coq Require Import ZArith MSetPositive FMapPositive + String Ascii Bool List HexString. From Crypto.Util Require Import ListUtil Strings.String Strings.Decimal Strings.Show diff --git a/src/Stringification/Java.v b/src/Stringification/Java.v index 8c7b8c320c..63c0ca76e7 100644 --- a/src/Stringification/Java.v +++ b/src/Stringification/Java.v @@ -1,5 +1,5 @@ -From Coq Require Import ZArith.ZArith MSets.MSetPositive FSets.FMapPositive - Strings.String Strings.Ascii Bool.Bool Lists.List Strings.HexString. +From Coq Require Import ZArith MSetPositive FMapPositive + String Ascii Bool List HexString. From Crypto.Util Require Import ListUtil Strings.String Strings.Decimal Strings.Show diff --git a/src/Stringification/Language.v b/src/Stringification/Language.v index 423d1ce3f9..67e0a43127 100644 --- a/src/Stringification/Language.v +++ b/src/Stringification/Language.v @@ -1,15 +1,15 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.micromega.Lia. -Require Import Coq.Strings.String. -Require Import Coq.Strings.Ascii. -Require Import Coq.Bool.Bool. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.MSets.MSetInterface. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.Strings.HexString. +From Coq Require Import ZArith. +From Coq Require Import MSetPositive. +From Coq Require Import FMapPositive. +From Coq Require Import Lia. +From Coq Require Import String. +From Coq Require Import Ascii. +From Coq Require Import Bool. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import MSetInterface. +From Coq Require Import MSetPositive. +From Coq Require Import HexString. Require Import Crypto.Util.ListUtil Coq.Lists.List. Require Import Crypto.Util.Sigma. Require Import Crypto.Util.Prod. diff --git a/src/Stringification/Rust.v b/src/Stringification/Rust.v index cc9554745d..f29d03fa71 100644 --- a/src/Stringification/Rust.v +++ b/src/Stringification/Rust.v @@ -1,5 +1,5 @@ -From Coq Require Import ZArith.ZArith MSets.MSetPositive FSets.FMapPositive - Strings.String Strings.Ascii Bool.Bool Lists.List Strings.HexString. +From Coq Require Import ZArith MSetPositive FMapPositive + String Ascii Bool List HexString. From Crypto.Util Require Import ListUtil Strings.String Strings.Decimal Strings.Show diff --git a/src/Stringification/Zig.v b/src/Stringification/Zig.v index 421bf92b14..94641dff62 100644 --- a/src/Stringification/Zig.v +++ b/src/Stringification/Zig.v @@ -1,5 +1,5 @@ -From Coq Require Import ZArith.ZArith MSets.MSetPositive FSets.FMapPositive - Strings.String Strings.Ascii Bool.Bool Lists.List Strings.HexString. +From Coq Require Import ZArith MSetPositive FMapPositive + String Ascii Bool List HexString. From Crypto.Util Require Import ListUtil Strings.String Strings.Decimal Strings.Show diff --git a/src/TAPSort.v b/src/TAPSort.v index ac4ae1255b..5afee1ef3c 100644 --- a/src/TAPSort.v +++ b/src/TAPSort.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Sorting.Mergesort. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import Mergesort. Module TAPOrder <: Orders.TotalLeBool. diff --git a/src/UnsaturatedSolinasHeuristics.v b/src/UnsaturatedSolinasHeuristics.v index 6cea791bc0..d9724b25ca 100644 --- a/src/UnsaturatedSolinasHeuristics.v +++ b/src/UnsaturatedSolinasHeuristics.v @@ -1,8 +1,8 @@ -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.QArith.QArith_base Coq.QArith.Qround. -Require Import Coq.QArith.Qabs. +From Coq Require Import List. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import QArith_base Qround. +From Coq Require Import Qabs. Require Import Crypto.Arithmetic.Core. Require Import Crypto.Arithmetic.ModOps. Require Import Crypto.Arithmetic.Partition. diff --git a/src/UnsaturatedSolinasHeuristics/Tests.v b/src/UnsaturatedSolinasHeuristics/Tests.v index 4128d6b0b8..506637b5df 100644 --- a/src/UnsaturatedSolinasHeuristics/Tests.v +++ b/src/UnsaturatedSolinasHeuristics/Tests.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. -Require Import Coq.ZArith.ZArith. +From Coq Require Import String. +From Coq Require Import List. +From Coq Require Import ZArith. Require Import Crypto.Util.Option. Require Import Crypto.UnsaturatedSolinasHeuristics. Require Import Crypto.Util.Strings.Show. diff --git a/src/Util/AdditionChainExponentiation.v b/src/Util/AdditionChainExponentiation.v index 803cc85c63..ff8ea8ba20 100644 --- a/src/Util/AdditionChainExponentiation.v +++ b/src/Util/AdditionChainExponentiation.v @@ -1,6 +1,6 @@ -Require Import Coq.funind.FunInd. -Require Import Coq.Lists.List Coq.Lists.SetoidList. Import ListNotations. -Require Import Coq.Numbers.BinNums Coq.NArith.BinNat. +From Coq Require Import FunInd. +From Coq Require Import List SetoidList. Import ListNotations. +From Coq Require Import BinNums BinNat. Require Import Crypto.Util.ListUtil. Require Import Crypto.Algebra.Monoid Crypto.Algebra.ScalarMult. Require Import Crypto.Util.Option. diff --git a/src/Util/Arg.v b/src/Util/Arg.v index 3e9ea65ef8..4ec4aad4a8 100644 --- a/src/Util/Arg.v +++ b/src/Util/Arg.v @@ -1,11 +1,11 @@ (** Coq version of OCaml's Arg module *) -Require Import Coq.Lists.List. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Strings.OctalString. -Require Import Coq.Strings.HexString. -Require Import Coq.Strings.BinaryString. +From Coq Require Import List. +From Coq Require Import Ascii. +From Coq Require Import String. +From Coq Require Import ZArith. +From Coq Require Import OctalString. +From Coq Require Import HexString. +From Coq Require Import BinaryString. Require Import Crypto.Util.Strings.Ascii. Require Import Crypto.Util.Strings.String. Require Import Crypto.Util.Strings.Decimal. diff --git a/src/Util/Bool.v b/src/Util/Bool.v index d146585207..7fbb454e6d 100644 --- a/src/Util/Bool.v +++ b/src/Util/Bool.v @@ -1,5 +1,5 @@ (*** Boolean Utility Lemmas and Databases *) -Require Import Coq.Bool.Bool. +From Coq Require Import Bool. Require Import Crypto.Util.Notations. (** For equalities of booleans *) diff --git a/src/Util/Bool/Equality.v b/src/Util/Bool/Equality.v index 217b512b09..122d8632b6 100644 --- a/src/Util/Bool/Equality.v +++ b/src/Util/Bool/Equality.v @@ -1,3 +1,3 @@ -Require Import Coq.Bool.Bool. +From Coq Require Import Bool. Scheme Equality for bool. diff --git a/src/Util/Bool/IsTrue.v b/src/Util/Bool/IsTrue.v index a59b58fd96..b1144fd2e7 100644 --- a/src/Util/Bool/IsTrue.v +++ b/src/Util/Bool/IsTrue.v @@ -1,4 +1,4 @@ -Require Import Coq.Bool.Bool. +From Coq Require Import Bool. Definition adjust_is_true {P} (v : is_true P) : is_true P := match P as P return is_true P -> is_true P with diff --git a/src/Util/Bool/LeCompat.v b/src/Util/Bool/LeCompat.v index 2b7291ab33..64b1224900 100644 --- a/src/Util/Bool/LeCompat.v +++ b/src/Util/Bool/LeCompat.v @@ -1,4 +1,4 @@ -Require Import Coq.Bool.Bool. +From Coq Require Import Bool. (* Compat for Coq 8.9 *) Module Export Coq. Module Export Bool. diff --git a/src/Util/Bool/Reflect.v b/src/Util/Bool/Reflect.v index eec2f1bc05..c075c40691 100644 --- a/src/Util/Bool/Reflect.v +++ b/src/Util/Bool/Reflect.v @@ -1,12 +1,12 @@ (** * Some lemmas about [Bool.reflect] *) -Require Import Coq.Classes.CMorphisms. -Require Import Coq.Strings.String. -Require Import Coq.Strings.Ascii. -Require Import Coq.Bool.Bool. -Require Import Coq.Classes.RelationClasses. -Require Import Coq.Arith.Arith. -Require Import Coq.ZArith.BinInt Coq.ZArith.ZArith_dec. -Require Import Coq.NArith.BinNat. +From Coq Require Import CMorphisms. +From Coq Require Import String. +From Coq Require Import Ascii. +From Coq Require Import Bool. +From Coq Require Import RelationClasses. +From Coq Require Import Arith. +From Coq Require Import BinInt ZArith_dec. +From Coq Require Import BinNat. Require Import Crypto.Util.HProp. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.Prod. @@ -59,8 +59,8 @@ Proof. apply reflect_to_brel; assumption. Qed. Lemma reflect_rect_dep {P b} (Q : reflect P b -> Type) (H : forall pf : if b then P else ~P, (if b return (reflect P b -> Type) -> (if b then P else ~P) -> Type - then fun Q pf => Q (ReflectT _ pf) - else fun Q pf => Q (ReflectF _ pf)) + then fun Q pf => Q (@ReflectT _ pf) + else fun Q pf => Q (@ReflectF _ pf)) Q pf) : forall x, Q x. Proof. intro x; destruct x; apply H. Defined. @@ -295,8 +295,8 @@ Local Hint Resolve internal_prod_dec_bl internal_prod_dec_lb Local Hint Extern 0 => solve [ solve_reflect ] : typeclass_instances. Local Hint Extern 1 => progress inversion_sigma : core. -Global Instance reflect_True : reflect True true | 0 := ReflectT _ I. -Global Instance reflect_False : reflect False false | 0 := ReflectF _ (fun x => x). +Global Instance reflect_True : reflect True true | 0 := @ReflectT _ I. +Global Instance reflect_False : reflect False false | 0 := @ReflectF _ (fun x => x). Global Instance reflect_or {A B a b} `{reflect A a, reflect B b} : reflect (A \/ B) (orb a b) | 10. exact _. Qed. Global Instance reflect_and {A B a b} `{reflect A a, reflect B b} : reflect (A /\ B) (andb a b) | 10. exact _. Qed. Global Instance reflect_impl_or {A B bona} `{reflect (B \/ ~A) bona} : reflect (A -> B) bona | 15. exact _. Qed. diff --git a/src/Util/CPSUtil.v b/src/Util/CPSUtil.v index 7b85116d73..555ea6fdc9 100644 --- a/src/Util/CPSUtil.v +++ b/src/Util/CPSUtil.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. Import ListNotations. -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import List. Import ListNotations. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.ListUtil. diff --git a/src/Util/Compose.v b/src/Util/Compose.v index 08e45f9ca4..c5811ee80b 100644 --- a/src/Util/Compose.v +++ b/src/Util/Compose.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. +From Coq Require Import Morphisms Setoid. Require Import Crypto.Util.FixCoqMistakes. Require Import Crypto.Util.GlobalSettings. Require Import Crypto.Util.Notations. diff --git a/src/Util/DebugMonad.v b/src/Util/DebugMonad.v index 31124ab49c..dbee1e736c 100644 --- a/src/Util/DebugMonad.v +++ b/src/Util/DebugMonad.v @@ -1,5 +1,5 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import String. +From Coq Require Import List. Require Import Crypto.Util.Notations. Require Export Crypto.Util.GlobalSettings. Require Export Crypto.Util.FixCoqMistakes. diff --git a/src/Util/Decidable.v b/src/Util/Decidable.v index b2dc209706..ba1d51f31d 100644 --- a/src/Util/Decidable.v +++ b/src/Util/Decidable.v @@ -1,12 +1,12 @@ (** Typeclass for decidable propositions *) -Require Import Coq.Logic.Eqdep_dec. -Require Import Coq.Lists.List. +From Coq Require Import Eqdep_dec. +From Coq Require Import List. Require Import Crypto.Util.FixCoqMistakes. Require Import Crypto.Util.Sigma. Require Import Crypto.Util.HProp. -Require Import Coq.ZArith.BinInt Coq.ZArith.ZArith_dec. -Require Import Coq.NArith.BinNat. +From Coq Require Import BinInt ZArith_dec. +From Coq Require Import BinNat. Local Open Scope type_scope. diff --git a/src/Util/Decidable/Bool2Prop.v b/src/Util/Decidable/Bool2Prop.v index 1f0235ab05..7a7dfe7fca 100644 --- a/src/Util/Decidable/Bool2Prop.v +++ b/src/Util/Decidable/Bool2Prop.v @@ -1,4 +1,4 @@ -Require Coq.ZArith.ZArith. +From Coq Require ZArith. Lemma unit_eq (x y:unit) : x = y. destruct x, y; reflexivity. Qed. Global Hint Resolve unit_eq : core. diff --git a/src/Util/Decidable/Decidable2Bool.v b/src/Util/Decidable/Decidable2Bool.v index f082ad2110..891c87b8e9 100644 --- a/src/Util/Decidable/Decidable2Bool.v +++ b/src/Util/Decidable/Decidable2Bool.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.QArith.QArith_base. -Require Import Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import QArith_base. +From Coq Require Import Lia. +From Coq Require Import List. Require Import Crypto.Util.SideConditions.ReductionPackages. Require Import Crypto.Util.Tuple. Require Import Crypto.Util.Decidable. diff --git a/src/Util/DynList.v b/src/Util/DynList.v index 545636c96c..a19f6a36e8 100644 --- a/src/Util/DynList.v +++ b/src/Util/DynList.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Export Crypto.Util.FixCoqMistakes. Local Set Universe Polymorphism. Inductive dyn_list := nil | cons {T} (x : T) (xs : dyn_list). diff --git a/src/Util/Equality.v b/src/Util/Equality.v index 298e380635..bd8253cfef 100644 --- a/src/Util/Equality.v +++ b/src/Util/Equality.v @@ -4,7 +4,7 @@ [eq]. We build up enough lemmas about this structure to deal nicely with proofs of equality that come up in practice in this project. *) -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Util.Isomorphism. Require Import Crypto.Util.HProp. diff --git a/src/Util/ErrorT/List.v b/src/Util/ErrorT/List.v index 28545e870d..2110a082ef 100644 --- a/src/Util/ErrorT/List.v +++ b/src/Util/ErrorT/List.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import Lia. +From Coq Require Import List. Require Import Crypto.Util.ErrorT. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Tactics.SplitInContext. diff --git a/src/Util/ErrorT/Show.v b/src/Util/ErrorT/Show.v index 888717c683..570c2e26c7 100644 --- a/src/Util/ErrorT/Show.v +++ b/src/Util/ErrorT/Show.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.Util.Strings.Show. Require Import Crypto.Util.ErrorT. Import ListNotations. diff --git a/src/Util/FSets/FMapBool.v b/src/Util/FSets/FMapBool.v index f3bac952b1..cfbe63e266 100644 --- a/src/Util/FSets/FMapBool.v +++ b/src/Util/FSets/FMapBool.v @@ -1,8 +1,8 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/FSets/FMapEmpty.v b/src/Util/FSets/FMapEmpty.v index fb8f8539ec..aad2cbff7a 100644 --- a/src/Util/FSets/FMapEmpty.v +++ b/src/Util/FSets/FMapEmpty.v @@ -1,8 +1,8 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/FSets/FMapFacts.v b/src/Util/FSets/FMapFacts.v index cbd16a1880..bbe4a6e6ff 100644 --- a/src/Util/FSets/FMapFacts.v +++ b/src/Util/FSets/FMapFacts.v @@ -1,8 +1,8 @@ -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapFacts. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. -Require Import Coq.Classes.RelationPairs. +From Coq Require Import FMapInterface. +From Coq Require Import FMapFacts. +From Coq Require Import Equalities. +From Coq Require Import Orders. +From Coq Require Import RelationPairs. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Orders. Require Import Crypto.Util.Option. diff --git a/src/Util/FSets/FMapFlip.v b/src/Util/FSets/FMapFlip.v index 1e516e7ea1..e82c940bba 100644 --- a/src/Util/FSets/FMapFlip.v +++ b/src/Util/FSets/FMapFlip.v @@ -1,10 +1,10 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.OrderedType. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Equalities. +From Coq Require Import OrderedType. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.ListUtil.SetoidListRev. diff --git a/src/Util/FSets/FMapInterface.v b/src/Util/FSets/FMapInterface.v index 1a49e830dc..b80064afba 100644 --- a/src/Util/FSets/FMapInterface.v +++ b/src/Util/FSets/FMapInterface.v @@ -1,6 +1,6 @@ -Require Import Coq.FSets.FMapInterface. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import FMapInterface. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Orders. diff --git a/src/Util/FSets/FMapIso.v b/src/Util/FSets/FMapIso.v index d9e2f00061..e023be222c 100644 --- a/src/Util/FSets/FMapIso.v +++ b/src/Util/FSets/FMapIso.v @@ -1,8 +1,8 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/FSets/FMapN.v b/src/Util/FSets/FMapN.v index 56a780b332..a8f341448e 100644 --- a/src/Util/FSets/FMapN.v +++ b/src/Util/FSets/FMapN.v @@ -1,10 +1,10 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.OrderedType. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.NArith.NArith. +From Coq Require Import Lia. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import OrderedType. +From Coq Require Import FMapInterface. +From Coq Require Import FMapPositive. +From Coq Require Import NArith. Require Import Crypto.Util.FSets.FMapInterface. Require Import Crypto.Util.FSets.FMapIso. Require Import Crypto.Util.FSets.FMapOption. diff --git a/src/Util/FSets/FMapOption.v b/src/Util/FSets/FMapOption.v index c71f602214..40867b2cf3 100644 --- a/src/Util/FSets/FMapOption.v +++ b/src/Util/FSets/FMapOption.v @@ -1,9 +1,9 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapFacts. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. +From Coq Require Import FMapFacts. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/FSets/FMapProd.v b/src/Util/FSets/FMapProd.v index 6a4444e172..6600a61da4 100644 --- a/src/Util/FSets/FMapProd.v +++ b/src/Util/FSets/FMapProd.v @@ -1,11 +1,11 @@ -Require Import Coq.Program.Program. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapFacts. -Require Import Coq.Classes.RelationPairs. +From Coq Require Import Program. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. +From Coq Require Import FMapFacts. +From Coq Require Import RelationPairs. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.ListUtil.SetoidListFlatMap. diff --git a/src/Util/FSets/FMapSect.v b/src/Util/FSets/FMapSect.v index 97a944350f..17bdc154a9 100644 --- a/src/Util/FSets/FMapSect.v +++ b/src/Util/FSets/FMapSect.v @@ -1,9 +1,9 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.Program.Program. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. +From Coq Require Import Program. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.Forall. Require Import Crypto.Util.ListUtil.SetoidList. diff --git a/src/Util/FSets/FMapString.v b/src/Util/FSets/FMapString.v index 4a445c1fba..df22085e9b 100644 --- a/src/Util/FSets/FMapString.v +++ b/src/Util/FSets/FMapString.v @@ -1,7 +1,7 @@ -Require Import Coq.Strings.String. -Require Import Coq.FSets.FMapFullAVL. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.Structures.OrderedTypeEx. +From Coq Require Import String. +From Coq Require Import FMapFullAVL. +From Coq Require Import FMapInterface. +From Coq Require Import OrderedTypeEx. Require Export Crypto.Util.FixCoqMistakes. (* TODO: use tries instead? *) diff --git a/src/Util/FSets/FMapSum.v b/src/Util/FSets/FMapSum.v index c5ea6d003c..b92a9177ad 100644 --- a/src/Util/FSets/FMapSum.v +++ b/src/Util/FSets/FMapSum.v @@ -1,9 +1,9 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapFacts. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. +From Coq Require Import FMapFacts. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/FSets/FMapTrie.v b/src/Util/FSets/FMapTrie.v index de4f0f1e0a..9b07f41a51 100644 --- a/src/Util/FSets/FMapTrie.v +++ b/src/Util/FSets/FMapTrie.v @@ -5,13 +5,13 @@ (** This module implements tries. It follows the implementation from Coq's clib, to some extent. *) -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapFacts. -Require Import Coq.Classes.RelationPairs. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. +From Coq Require Import FMapFacts. +From Coq Require Import RelationPairs. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.ListUtil.SetoidListFlatMap. diff --git a/src/Util/FSets/FMapTrie/Shape.v b/src/Util/FSets/FMapTrie/Shape.v index 653e9d1deb..9d43599d71 100644 --- a/src/Util/FSets/FMapTrie/Shape.v +++ b/src/Util/FSets/FMapTrie/Shape.v @@ -1,9 +1,9 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.Classes.RelationPairs. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. +From Coq Require Import RelationPairs. Require Import Crypto.Util.Option. Require Import Crypto.Util.Prod. Require Import Crypto.Util.ListUtil. diff --git a/src/Util/FSets/FMapTrie/ShapeEx.v b/src/Util/FSets/FMapTrie/ShapeEx.v index c2f734782b..d0e7e35d03 100644 --- a/src/Util/FSets/FMapTrie/ShapeEx.v +++ b/src/Util/FSets/FMapTrie/ShapeEx.v @@ -1,6 +1,6 @@ -Require Import Coq.Structures.OrderedTypeEx. -Require Import Coq.PArith.PArith. -Require Import Coq.FSets.FMapPositive. +From Coq Require Import OrderedTypeEx. +From Coq Require Import PArith. +From Coq Require Import FMapPositive. Require Import Crypto.Util.Option. Require Import Crypto.Util.Equality. Require Import Crypto.Util.Structures.OrdersEx. diff --git a/src/Util/FSets/FMapTrieEx.v b/src/Util/FSets/FMapTrieEx.v index ef257f8bd7..af3f294a61 100644 --- a/src/Util/FSets/FMapTrieEx.v +++ b/src/Util/FSets/FMapTrieEx.v @@ -1,6 +1,6 @@ -Require Import Coq.Structures.OrderedTypeEx. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.FSets.FMapInterface. +From Coq Require Import OrderedTypeEx. +From Coq Require Import FMapPositive. +From Coq Require Import FMapInterface. Require Import Crypto.Util.FSets.FMapInterface. Require Import Crypto.Util.FSets.FMapTrie. Require Import Crypto.Util.FSets.FMapTrie.ShapeEx. diff --git a/src/Util/FSets/FMapUnit.v b/src/Util/FSets/FMapUnit.v index 5b6df81df0..7c2c53fbaa 100644 --- a/src/Util/FSets/FMapUnit.v +++ b/src/Util/FSets/FMapUnit.v @@ -1,8 +1,8 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.FSets.FMapInterface. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import FMapInterface. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/FSets/FMapZ.v b/src/Util/FSets/FMapZ.v index b9935e20b7..03bd9f9ae0 100644 --- a/src/Util/FSets/FMapZ.v +++ b/src/Util/FSets/FMapZ.v @@ -1,10 +1,10 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.OrderedType. -Require Import Coq.FSets.FMapInterface. -Require Import Coq.FSets.FMapPositive. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import OrderedType. +From Coq Require Import FMapInterface. +From Coq Require Import FMapPositive. +From Coq Require Import ZArith. Require Import Crypto.Util.FSets.FMapInterface. Require Import Crypto.Util.FSets.FMapIso. Require Import Crypto.Util.FSets.FMapFlip. diff --git a/src/Util/Factorize.v b/src/Util/Factorize.v index b4a4c5befc..33840fefa7 100644 --- a/src/Util/Factorize.v +++ b/src/Util/Factorize.v @@ -1,9 +1,9 @@ -Require Import Coq.Bool.Sumbool. -Require Import Coq.micromega.Lia. -Require Import Coq.NArith.NArith. -Require Import Coq.PArith.PArith. -Require Import Coq.Lists.List. -Require Import Coq.Init.Wf. +From Coq Require Import Sumbool. +From Coq Require Import Lia. +From Coq Require Import NArith. +From Coq Require Import PArith. +From Coq Require Import List. +From Coq.Program Require Import Wf. Local Open Scope positive_scope. diff --git a/src/Util/FixCoqMistakes.v b/src/Util/FixCoqMistakes.v index 613a1e0c1b..bfb84e9aaf 100644 --- a/src/Util/FixCoqMistakes.v +++ b/src/Util/FixCoqMistakes.v @@ -1,5 +1,5 @@ (** * Fixes *) -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Export Crypto.Util.GlobalSettings. (** Coq is poorly designed in some ways. We fix some of these issues diff --git a/src/Util/FsatzAutoLemmas.v b/src/Util/FsatzAutoLemmas.v index 98483a0fe2..48a0c2343f 100644 --- a/src/Util/FsatzAutoLemmas.v +++ b/src/Util/FsatzAutoLemmas.v @@ -1,5 +1,5 @@ -Require Import Coq.Program.Basics Coq.Program.Tactics. -Require Import Coq.Classes.Morphisms. +From Coq.Program Require Import Basics Tactics. +From Coq Require Import Morphisms. Require Import Crypto.Util.Decidable. Require Import Crypto.Algebra.Field. diff --git a/src/Util/HList.v b/src/Util/HList.v index d2ea841d3d..1bee26a728 100644 --- a/src/Util/HList.v +++ b/src/Util/HList.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. -Require Import Coq.Lists.List. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. +From Coq Require Import List. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.IffT. diff --git a/src/Util/IffT.v b/src/Util/IffT.v index f4eaa9d53f..911b204a99 100644 --- a/src/Util/IffT.v +++ b/src/Util/IffT.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.RelationClasses. +From Coq Require Import RelationClasses. Notation iffT A B := (((A -> B) * (B -> A)))%type. Notation iffTp := (fun A B => inhabited (iffT A B)). diff --git a/src/Util/LetIn.v b/src/Util/LetIn.v index a38950f594..8f05ad09d4 100644 --- a/src/Util/LetIn.v +++ b/src/Util/LetIn.v @@ -1,5 +1,5 @@ Require Import Crypto.Util.FixCoqMistakes. -Require Import Coq.Classes.Morphisms Coq.Relations.Relation_Definitions. +From Coq Require Import Morphisms Relation_Definitions. Require Import Crypto.Util.Tactics.GetGoal. Require Import Crypto.Util.Notations. Require Rewriter.Util.LetIn. diff --git a/src/Util/LetInMonad.v b/src/Util/LetInMonad.v index 3e27bcb4be..d4b3ff1b14 100644 --- a/src/Util/LetInMonad.v +++ b/src/Util/LetInMonad.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Import Crypto.Util.LetIn. Require Import Crypto.Util.Notations. diff --git a/src/Util/Level.v b/src/Util/Level.v index db7018d53a..8faf88cc93 100644 --- a/src/Util/Level.v +++ b/src/Util/Level.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Relations.Relations. -Require Import Coq.Classes.Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import Relations. +From Coq Require Import Morphisms. Require Import Crypto.Util.Bool.Reflect. Require Import Crypto.Util.Decidable. diff --git a/src/Util/ListUtil.v b/src/Util/ListUtil.v index fcc5ed2d3e..ea1b99de67 100644 --- a/src/Util/ListUtil.v +++ b/src/Util/ListUtil.v @@ -1,10 +1,10 @@ -Require Import Coq.Lists.List. -Require Import Coq.Lists.SetoidList. -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.Peano_dec. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Arith.Arith. -Require Import Coq.Classes.Morphisms. +From Coq Require Import List. +From Coq Require Import SetoidList. +From Coq Require Import Lia. +From Coq Require Import Peano_dec. +From Coq Require Import ZArith. +From Coq Require Import Arith. +From Coq Require Import Morphisms. Require Import Crypto.Util.NatUtil. Require Import Crypto.Util.Pointed. Require Import Crypto.Util.Prod. @@ -2134,7 +2134,7 @@ Qed. Global Instance fold_left_Proper_eq {A B} : Proper ((eq ==> eq ==> eq) ==> eq ==> eq ==> eq) (@fold_left A B) | 1. Proof. cbv [respectful]; repeat intro; subst; apply fold_left_Proper; repeat intro; eauto. Qed. -Require Import Coq.Lists.SetoidList. +From Coq Require Import SetoidList. Global Instance Proper_nth_default : forall A eq, Proper (eq==>eqlistA eq==>Logic.eq==>eq) (nth_default (A:=A)). Proof. diff --git a/src/Util/ListUtil/CombineExtend.v b/src/Util/ListUtil/CombineExtend.v index ae00e7cd00..aad2c97788 100644 --- a/src/Util/ListUtil/CombineExtend.v +++ b/src/Util/ListUtil/CombineExtend.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Export Crypto.Util.FixCoqMistakes. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/ListUtil/Concat.v b/src/Util/ListUtil/Concat.v index e9484f88f4..3e5ec6d10b 100644 --- a/src/Util/ListUtil/Concat.v +++ b/src/Util/ListUtil/Concat.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Import Crypto.Util.FixCoqMistakes. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/ListUtil/Filter.v b/src/Util/ListUtil/Filter.v index caa8f9a531..eb581d1842 100644 --- a/src/Util/ListUtil/Filter.v +++ b/src/Util/ListUtil/Filter.v @@ -1,7 +1,7 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.Arith. -Require Import Coq.Lists.List. -Require Import Coq.Classes.Morphisms. +From Coq Require Import Lia. +From Coq Require Import Arith. +From Coq Require Import List. +From Coq Require Import Morphisms. Require Export Crypto.Util.FixCoqMistakes. Import ListNotations. Local Set Implicit Arguments. diff --git a/src/Util/ListUtil/FoldBool.v b/src/Util/ListUtil/FoldBool.v index 5c2a96a21f..b53ed48c7c 100644 --- a/src/Util/ListUtil/FoldBool.v +++ b/src/Util/ListUtil/FoldBool.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Lists.List. +From Coq Require Import Morphisms. +From Coq Require Import List. Require Import Crypto.Util.Bool. Import ListNotations. Open Scope bool_scope. diff --git a/src/Util/ListUtil/FoldMap.v b/src/Util/ListUtil/FoldMap.v index fe1b9e47a8..0a9ed8cb4d 100644 --- a/src/Util/ListUtil/FoldMap.v +++ b/src/Util/ListUtil/FoldMap.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Module List. Section FoldMap. (* map over a list in the state monad *) diff --git a/src/Util/ListUtil/Forall.v b/src/Util/ListUtil/Forall.v index 90f7ef52b8..ba3120583a 100644 --- a/src/Util/ListUtil/Forall.v +++ b/src/Util/ListUtil/Forall.v @@ -1,6 +1,6 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Lists.List. +From Coq Require Import Lia. +From Coq Require Import Morphisms. +From Coq Require Import List. Require Import Crypto.Util.Tactics.SpecializeBy. Require Import Crypto.Util.Tactics.SplitInContext. Require Import Crypto.Util.Tactics.DestructHead. diff --git a/src/Util/ListUtil/ForallIn.v b/src/Util/ListUtil/ForallIn.v index 260a7a4d50..52860a5b37 100644 --- a/src/Util/ListUtil/ForallIn.v +++ b/src/Util/ListUtil/ForallIn.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Import Crypto.Util.Prod. Require Import Crypto.Util.Tactics.DestructHead. diff --git a/src/Util/ListUtil/GroupAllBy.v b/src/Util/ListUtil/GroupAllBy.v index 2dd14b6bd9..66e5d8ad1e 100644 --- a/src/Util/ListUtil/GroupAllBy.v +++ b/src/Util/ListUtil/GroupAllBy.v @@ -1,7 +1,7 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.Arith. -Require Import Coq.Sorting.Permutation. -Require Import Coq.Lists.List. +From Coq Require Import Lia. +From Coq Require Import Arith. +From Coq Require Import Permutation. +From Coq Require Import List. Require Import Crypto.Util.ListUtil.Partition. Require Import Crypto.Util.ListUtil.StdlibCompat. Require Export Crypto.Util.FixCoqMistakes. diff --git a/src/Util/ListUtil/IndexOf.v b/src/Util/ListUtil/IndexOf.v index 867b3fe509..b819796196 100644 --- a/src/Util/ListUtil/IndexOf.v +++ b/src/Util/ListUtil/IndexOf.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Import Crypto.Util.Option. Require Import Crypto.Util.Tactics.BreakMatch. diff --git a/src/Util/ListUtil/NthExt.v b/src/Util/ListUtil/NthExt.v index 989a3ca5ab..3fcfe39728 100644 --- a/src/Util/ListUtil/NthExt.v +++ b/src/Util/ListUtil/NthExt.v @@ -1,6 +1,6 @@ (* We copy some proofs from the standard library so we can use them in older versions of Coq; once we get a new enough Coq, this file should go away *) -Require Import Coq.Lists.List. -Require Import Coq.Arith.Arith. +From Coq Require Import List. +From Coq Require Import Arith. Import ListNotations. Local Open Scope list_scope. Module Export List. diff --git a/src/Util/ListUtil/Partition.v b/src/Util/ListUtil/Partition.v index b0fd3793ea..c2d1c2fdf5 100644 --- a/src/Util/ListUtil/Partition.v +++ b/src/Util/ListUtil/Partition.v @@ -1,5 +1,5 @@ -Require Import Coq.Sorting.Permutation. -Require Import Coq.Lists.List. +From Coq Require Import Permutation. +From Coq Require Import List. Require Export Crypto.Util.FixCoqMistakes. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/ListUtil/Permutation.v b/src/Util/ListUtil/Permutation.v index d23ff111c4..9ed917db38 100644 --- a/src/Util/ListUtil/Permutation.v +++ b/src/Util/ListUtil/Permutation.v @@ -1,10 +1,10 @@ -Require Import Coq.NArith.NArith. -Require Import Coq.Arith.Arith. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.Sorting.Permutation. -Require Import Coq.Setoids.Setoid. -Require Import Coq.Classes.Morphisms. +From Coq Require Import NArith. +From Coq Require Import Arith. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Permutation. +From Coq Require Import Setoid. +From Coq Require Import Morphisms. Require Import Crypto.Util.Tactics.BreakMatch. Import ListNotations. diff --git a/src/Util/ListUtil/PermutationCompat.v b/src/Util/ListUtil/PermutationCompat.v index 789abb1f99..2a3143866c 100644 --- a/src/Util/ListUtil/PermutationCompat.v +++ b/src/Util/ListUtil/PermutationCompat.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. -Require Import Coq.Sorting.Permutation. +From Coq Require Import List. +From Coq Require Import Permutation. Import List Setoid Compare_dec Morphisms FinFun PeanoNat Permutation. Import ListNotations. Local Set Implicit Arguments. diff --git a/src/Util/ListUtil/RemoveN.v b/src/Util/ListUtil/RemoveN.v index db73e8542d..e1c9e33380 100644 --- a/src/Util/ListUtil/RemoveN.v +++ b/src/Util/ListUtil/RemoveN.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/ListUtil/SetoidList.v b/src/Util/ListUtil/SetoidList.v index 2c5188f1c5..28c41b309e 100644 --- a/src/Util/ListUtil/SetoidList.v +++ b/src/Util/ListUtil/SetoidList.v @@ -1,6 +1,6 @@ -Require Import Coq.Lists.List. -Require Import Coq.Setoids.Setoid. -Require Import Coq.Lists.SetoidList. +From Coq Require Import List. +From Coq Require Import Setoid. +From Coq Require Import SetoidList. Require Import Crypto.Util.Option. Import ListNotations. diff --git a/src/Util/ListUtil/SetoidListFlatMap.v b/src/Util/ListUtil/SetoidListFlatMap.v index 7fe06b1286..fae87cf586 100644 --- a/src/Util/ListUtil/SetoidListFlatMap.v +++ b/src/Util/ListUtil/SetoidListFlatMap.v @@ -1,6 +1,6 @@ -Require Import Coq.Lists.List. -Require Import Coq.Setoids.Setoid. -Require Import Coq.Lists.SetoidList. +From Coq Require Import List. +From Coq Require Import Setoid. +From Coq Require Import SetoidList. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Tactics.SpecializeBy. Require Import Crypto.Util.Tactics.SpecializeUnderBindersBy. diff --git a/src/Util/ListUtil/SetoidListRev.v b/src/Util/ListUtil/SetoidListRev.v index 16f4906308..3de0664267 100644 --- a/src/Util/ListUtil/SetoidListRev.v +++ b/src/Util/ListUtil/SetoidListRev.v @@ -1,8 +1,8 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Program.Basics. -Require Import Coq.Sorting.Sorted. -Require Import Coq.Lists.List. -Require Import Coq.Lists.SetoidList. +From Coq Require Import Lia. +From Coq Require Import Basics. +From Coq Require Import Sorted. +From Coq Require Import List. +From Coq Require Import SetoidList. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/ListUtil/Split.v b/src/Util/ListUtil/Split.v index d97fd458b5..3618498aa8 100644 --- a/src/Util/ListUtil/Split.v +++ b/src/Util/ListUtil/Split.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Export Crypto.Util.FixCoqMistakes. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/ListUtil/StdlibCompat.v b/src/Util/ListUtil/StdlibCompat.v index 7ce5859f2c..be9fc2b795 100644 --- a/src/Util/ListUtil/StdlibCompat.v +++ b/src/Util/ListUtil/StdlibCompat.v @@ -1,8 +1,8 @@ (* Compat file for newer results from the stdlib *) -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.Arith. -Require Import Coq.Sorting.Permutation. -Require Import Coq.Lists.List. +From Coq Require Import Lia. +From Coq Require Import Arith. +From Coq Require Import Permutation. +From Coq Require Import List. Require Export Crypto.Util.FixCoqMistakes. Import ListNotations. Local Open Scope bool_scope. diff --git a/src/Util/Listable.v b/src/Util/Listable.v index 2622b9428b..feaad2c888 100644 --- a/src/Util/Listable.v +++ b/src/Util/Listable.v @@ -1,7 +1,7 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.Arith. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. +From Coq Require Import Lia. +From Coq Require Import Arith. +From Coq Require Import Bool. +From Coq Require Import List. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.Bool.Reflect. diff --git a/src/Util/Logic/ExistsEqAnd.v b/src/Util/Logic/ExistsEqAnd.v index 108224cb23..e0ef33ca26 100644 --- a/src/Util/Logic/ExistsEqAnd.v +++ b/src/Util/Logic/ExistsEqAnd.v @@ -1,4 +1,4 @@ -Require Import Coq.Setoids.Setoid. +From Coq Require Import Setoid. Require Import Crypto.Util.FixCoqMistakes. Require Import Crypto.Util.Tactics.DestructHead. diff --git a/src/Util/Loops.v b/src/Util/Loops.v index 72efdd8f9a..e0b76c88c7 100644 --- a/src/Util/Loops.v +++ b/src/Util/Loops.v @@ -1,4 +1,4 @@ -Require Import Coq.micromega.Lia. +From Coq Require Import Lia. Module Import core. Section Loops. diff --git a/src/Util/MSets/FMapPositive/Equality.v b/src/Util/MSets/FMapPositive/Equality.v index aacd06a584..8cba01fafd 100644 --- a/src/Util/MSets/FMapPositive/Equality.v +++ b/src/Util/MSets/FMapPositive/Equality.v @@ -1,4 +1,4 @@ -Require Import Coq.FSets.FMapPositive. +From Coq Require Import FMapPositive. Require Import Crypto.Util.Bool.Equality. Require Import Crypto.Util.Decidable. diff --git a/src/Util/MSets/MSetIso.v b/src/Util/MSets/MSetIso.v index 116430b2da..08ef935872 100644 --- a/src/Util/MSets/MSetIso.v +++ b/src/Util/MSets/MSetIso.v @@ -1,8 +1,8 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.MSets.MSetInterface. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import MSetInterface. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/MSets/MSetN.v b/src/Util/MSets/MSetN.v index 36e9eb2797..1dbac3c554 100644 --- a/src/Util/MSets/MSetN.v +++ b/src/Util/MSets/MSetN.v @@ -1,11 +1,11 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.MSets.MSetInterface. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.NArith.NArith. +From Coq Require Import Lia. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import MSetInterface. +From Coq Require Import MSetPositive. +From Coq Require Import NArith. Require Import Crypto.Util.MSets.MSetIso. Require Import Crypto.Util.Structures.Equalities.Iso. Require Import Crypto.Util.Structures.Orders.Iso. diff --git a/src/Util/MSets/MSetPositive/Equality.v b/src/Util/MSets/MSetPositive/Equality.v index 4a5872a5e0..7763ffad36 100644 --- a/src/Util/MSets/MSetPositive/Equality.v +++ b/src/Util/MSets/MSetPositive/Equality.v @@ -1,4 +1,4 @@ -Require Import Coq.MSets.MSetPositive. +From Coq Require Import MSetPositive. Require Import Crypto.Util.Bool.Equality. Require Import Crypto.Util.Decidable. diff --git a/src/Util/MSets/MSetPositive/Facts.v b/src/Util/MSets/MSetPositive/Facts.v index 3ccf5ad894..01286a39dd 100644 --- a/src/Util/MSets/MSetPositive/Facts.v +++ b/src/Util/MSets/MSetPositive/Facts.v @@ -1,9 +1,9 @@ -Require Import Coq.Setoids.Setoid. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Lists.List. -Require Import Coq.Lists.SetoidList. -Require Import Coq.MSets.MSetPositive. -Require Import Coq.MSets.MSetFacts. +From Coq Require Import Setoid. +From Coq Require Import Morphisms. +From Coq Require Import List. +From Coq Require Import SetoidList. +From Coq Require Import MSetPositive. +From Coq Require Import MSetFacts. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.SplitInContext. Require Import Crypto.Util.Tactics.SpecializeBy. diff --git a/src/Util/MSets/MSetPositive/Show.v b/src/Util/MSets/MSetPositive/Show.v index 7b5ad85fd3..dc658084ab 100644 --- a/src/Util/MSets/MSetPositive/Show.v +++ b/src/Util/MSets/MSetPositive/Show.v @@ -1,4 +1,4 @@ -Require Import Coq.MSets.MSetPositive. +From Coq Require Import MSetPositive. Require Import Crypto.Util.MSets.Show. Require Import Crypto.Util.Strings.Show. diff --git a/src/Util/MSets/MSetString.v b/src/Util/MSets/MSetString.v index 4767d72885..aeafde872a 100644 --- a/src/Util/MSets/MSetString.v +++ b/src/Util/MSets/MSetString.v @@ -1,8 +1,8 @@ -Require Import Coq.Strings.String. -Require Import Coq.MSets.MSetAVL. -Require Import Coq.MSets.MSetFacts. -Require Import Coq.MSets.MSetInterface. -Require Import Coq.Structures.OrdersEx. +From Coq Require Import String. +From Coq Require Import MSetAVL. +From Coq Require Import MSetFacts. +From Coq Require Import MSetInterface. +From Coq Require Import OrdersEx. Require Export Crypto.Util.FixCoqMistakes. (* TODO: use tries instead? *) diff --git a/src/Util/MSets/MSetSum.v b/src/Util/MSets/MSetSum.v index 68d6923045..e08d778fe7 100644 --- a/src/Util/MSets/MSetSum.v +++ b/src/Util/MSets/MSetSum.v @@ -1,8 +1,8 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.Lists.List. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.MSets.MSetInterface. +From Coq Require Import Bool. +From Coq Require Import List. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import MSetInterface. Require Import Crypto.Util.ListUtil. Require Import Crypto.Util.ListUtil.SetoidList. Require Import Crypto.Util.Compose. diff --git a/src/Util/MSets/Show.v b/src/Util/MSets/Show.v index bc9541e0e5..dcfaf87a84 100644 --- a/src/Util/MSets/Show.v +++ b/src/Util/MSets/Show.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. -Require Import Coq.MSets.MSetInterface. +From Coq Require Import List. +From Coq Require Import MSetInterface. Require Import Crypto.Util.Strings.Show. Module ShowWSetsOn (E : Equalities.DecidableType) (W : WSetsOn E). diff --git a/src/Util/NUtil/Sorting.v b/src/Util/NUtil/Sorting.v index 39b22a23b7..aff1f74c6c 100644 --- a/src/Util/NUtil/Sorting.v +++ b/src/Util/NUtil/Sorting.v @@ -1,6 +1,6 @@ -Require Import Coq.NArith.NArith. -Require Import Coq.micromega.Lia. -Require Coq.Sorting.Mergesort. +From Coq Require Import NArith. +From Coq Require Import Lia. +From Coq Require Mergesort. Module N. Module Order <: Orders.TotalLeBool. diff --git a/src/Util/NUtil/Testbit.v b/src/Util/NUtil/Testbit.v index f0ed6eb83e..eadf674b14 100644 --- a/src/Util/NUtil/Testbit.v +++ b/src/Util/NUtil/Testbit.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.NArith.NArith. +From Coq Require Import Lia. +From Coq Require Import NArith. Module N. Lemma testbit_ones n i : N.testbit (N.ones n) i = N.ltb i n. diff --git a/src/Util/NUtil/WithoutReferenceToZ.v b/src/Util/NUtil/WithoutReferenceToZ.v index 89e1f17056..2798d068b4 100644 --- a/src/Util/NUtil/WithoutReferenceToZ.v +++ b/src/Util/NUtil/WithoutReferenceToZ.v @@ -1,6 +1,6 @@ (** NUtil that doesn't depend on ZUtil stuff *) (** Should probably come up with a better organization of this stuff *) -Require Import Coq.NArith.NArith Coq.Arith.PeanoNat. +From Coq Require Import NArith PeanoNat. Require Import Crypto.Util.NatUtil Crypto.Util.Decidable. Module N. diff --git a/src/Util/NatUtil.v b/src/Util/NatUtil.v index 6e9347cea1..6ddd6daf43 100644 --- a/src/Util/NatUtil.v +++ b/src/Util/NatUtil.v @@ -1,9 +1,9 @@ -Require Coq.Logic.Eqdep_dec. -Require Import Coq.NArith.NArith. -Require Import Coq.Arith.Arith. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. -Require Import Coq.micromega.Lia. +From Coq Require Eqdep_dec. +From Coq Require Import NArith. +From Coq Require Import Arith. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. +From Coq Require Import Lia. Import Nat. Scheme Equality for nat. diff --git a/src/Util/NumTheoryUtil.v b/src/Util/NumTheoryUtil.v index 641445b28d..2cebd5ac35 100644 --- a/src/Util/NumTheoryUtil.v +++ b/src/Util/NumTheoryUtil.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.Zpower Coq.ZArith.Znumtheory Coq.ZArith.ZArith Coq.ZArith.Zdiv. -Require Import Coq.micromega.Lia Coq.Arith.Arith. +From Coq Require Import Zpower Znumtheory ZArith Zdiv. +From Coq Require Import Lia Arith. Require Import Crypto.Util.ZUtil.Divide. Require Import Crypto.Util.ZUtil.Modulo. Require Import Crypto.Util.ZUtil.Odd. diff --git a/src/Util/Option.v b/src/Util/Option.v index 78a964e7b4..3d23cec6d7 100644 --- a/src/Util/Option.v +++ b/src/Util/Option.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Notations. diff --git a/src/Util/OptionList.v b/src/Util/OptionList.v index 6dc6366f27..7f7d6beadc 100644 --- a/src/Util/OptionList.v +++ b/src/Util/OptionList.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import Lia. +From Coq Require Import List. Require Import Crypto.Util.Option. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Tactics.SplitInContext. diff --git a/src/Util/PER.v b/src/Util/PER.v index 758131b88e..71e0d3b50d 100644 --- a/src/Util/PER.v +++ b/src/Util/PER.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.RelationClasses Coq.Classes.Morphisms Coq.Relations.Relation_Definitions. +From Coq Require Import RelationClasses Morphisms Relation_Definitions. Lemma PER_valid_l {A} {R : relation A} {HS : Symmetric R} {HT : Transitive R} x y (H : R x y) : Proper R x. Proof. hnf; etransitivity; eassumption || symmetry; eassumption. Qed. diff --git a/src/Util/ParseTaps.v b/src/Util/ParseTaps.v index 47c6dd4426..c8da7c6b4b 100644 --- a/src/Util/ParseTaps.v +++ b/src/Util/ParseTaps.v @@ -1,5 +1,5 @@ -Require Import Coq.Lists.List. -Require Import Coq.ZArith.BinInt. +From Coq Require Import List. +From Coq Require Import BinInt. Require Import Crypto.Util.Notations. Import ListNotations. diff --git a/src/Util/PartiallyReifiedProp.v b/src/Util/PartiallyReifiedProp.v index 851fc6748c..f67b9f68f0 100644 --- a/src/Util/PartiallyReifiedProp.v +++ b/src/Util/PartiallyReifiedProp.v @@ -2,8 +2,8 @@ (** This allows for something between [bool] and [Prop], where we can computationally reduce things like [True /\ True], but can still express equality of types. *) -Require Import Coq.Setoids.Setoid. -Require Import Coq.Program.Tactics. +From Coq Require Import Setoid. +From Coq.Program Require Import Tactics. Require Import Crypto.Util.Notations. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Tactics.DestructHyps. diff --git a/src/Util/Pointed.v b/src/Util/Pointed.v index c9ce5f94bb..a33b1906ef 100644 --- a/src/Util/Pointed.v +++ b/src/Util/Pointed.v @@ -1,4 +1,4 @@ -Require Import Coq.Numbers.BinNums. +From Coq Require Import BinNums. Local Generalizable All Variables. diff --git a/src/Util/PointedProp.v b/src/Util/PointedProp.v index 10a032ca9f..ed0e82b639 100644 --- a/src/Util/PointedProp.v +++ b/src/Util/PointedProp.v @@ -2,7 +2,7 @@ (** This allows for something between [bool] and [Prop], where we can computationally reduce things like [True /\ True], but can still express equality of types. *) -Require Import Coq.Setoids.Setoid. +From Coq Require Import Setoid. Require Import Crypto.Util.Notations. Declare Scope pointed_prop_scope. diff --git a/src/Util/Pos.v b/src/Util/Pos.v index 67c7cfa35b..cb3e24b278 100644 --- a/src/Util/Pos.v +++ b/src/Util/Pos.v @@ -1,4 +1,4 @@ -Require Import Coq.PArith.BinPosDef. +From Coq Require Import BinPosDef. Local Open Scope positive_scope. (** Append two sequences *) diff --git a/src/Util/PrimitiveHList.v b/src/Util/PrimitiveHList.v index b1f4498b5a..4267db3c55 100644 --- a/src/Util/PrimitiveHList.v +++ b/src/Util/PrimitiveHList.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Import Crypto.Util.PrimitiveProd. Import Primitive.Notations. diff --git a/src/Util/PrimitiveProd.v b/src/Util/PrimitiveProd.v index 863d364c7e..745e96571a 100644 --- a/src/Util/PrimitiveProd.v +++ b/src/Util/PrimitiveProd.v @@ -5,7 +5,7 @@ between two such pairs, or when we want such an equality, we have a systematic way of reducing such equalities to equalities at simpler types. *) -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Util.IffT. Require Import Crypto.Util.Equality. Require Import Crypto.Util.GlobalSettings. diff --git a/src/Util/PrimitiveSigma.v b/src/Util/PrimitiveSigma.v index 8a81785fbb..5ce5461269 100644 --- a/src/Util/PrimitiveSigma.v +++ b/src/Util/PrimitiveSigma.v @@ -5,7 +5,7 @@ two such pairs, or when we want such an equality, we have a systematic way of reducing such equalities to equalities at simpler types. *) -Require Import Coq.Classes.Morphisms. +From Coq Require Import Morphisms. Require Import Crypto.Util.IffT. Require Import Crypto.Util.Equality. Require Import Crypto.Util.GlobalSettings. diff --git a/src/Util/Prod.v b/src/Util/Prod.v index 5f3a34c0be..539bf42a5d 100644 --- a/src/Util/Prod.v +++ b/src/Util/Prod.v @@ -5,9 +5,9 @@ between two such pairs, or when we want such an equality, we have a systematic way of reducing such equalities to equalities at simpler types. *) -Require Import Coq.Classes.Morphisms. -Require Import Coq.Setoids.Setoid. -Require Import Coq.Bool.Bool. +From Coq Require Import Morphisms. +From Coq Require Import Setoid. +From Coq Require Import Bool. Require Import Crypto.Util.IffT. Require Import Crypto.Util.Equality. Require Import Crypto.Util.GlobalSettings. diff --git a/src/Util/QUtil.v b/src/Util/QUtil.v index 3457e122bd..2f971ef8a7 100644 --- a/src/Util/QUtil.v +++ b/src/Util/QUtil.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.QArith.QArith QArith.Qround. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith QArith Qround. +From Coq Require Import Lia. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. Require Import Crypto.Util.ZUtil.Morphisms. diff --git a/src/Util/Relations.v b/src/Util/Relations.v index d81f09f7f6..2c192df552 100644 --- a/src/Util/Relations.v +++ b/src/Util/Relations.v @@ -1,6 +1,6 @@ Require Import Crypto.Util.FixCoqMistakes. Require Import Crypto.Util.Logic. -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. +From Coq Require Import Morphisms Setoid. Lemma symmetry_iff {T} {R} {Rsym:@Symmetric T R} x y: R x y <-> R y x. epose symmetry; intuition eauto. diff --git a/src/Util/SideConditions/RingPackage.v b/src/Util/SideConditions/RingPackage.v index 8541c00fc3..b91bc5c32e 100644 --- a/src/Util/SideConditions/RingPackage.v +++ b/src/Util/SideConditions/RingPackage.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.setoid_ring.Ring_tac. +From Coq Require Import ZArith. +From Coq Require Import Ring_tac. Require Import Crypto.Util.Prod. Require Import Crypto.Util.SideConditions.CorePackages. Require Export Crypto.Util.FixCoqMistakes. diff --git a/src/Util/Sigma/Related.v b/src/Util/Sigma/Related.v index bc3bacb90f..0d72483dea 100644 --- a/src/Util/Sigma/Related.v +++ b/src/Util/Sigma/Related.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.RelationClasses. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. +From Coq Require Import RelationClasses. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. Import EqNotations. Definition related_sigT_by_eq {A P1 P2} (R : forall x : A, P1 x -> P2 x -> Prop) diff --git a/src/Util/Sorting/Sorted/Proper.v b/src/Util/Sorting/Sorted/Proper.v index 8b1d792cfa..66b9a232be 100644 --- a/src/Util/Sorting/Sorted/Proper.v +++ b/src/Util/Sorting/Sorted/Proper.v @@ -1,8 +1,8 @@ -Require Import Coq.Lists.List. -Require Import Coq.Lists.SetoidList. -Require Import Coq.Lists.SetoidPermutation. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Sorting.Sorted. +From Coq Require Import List. +From Coq Require Import SetoidList. +From Coq Require Import SetoidPermutation. +From Coq Require Import Morphisms. +From Coq Require Import Sorted. Require Import Crypto.Util.Tactics.SplitInContext. Local Set Implicit Arguments. diff --git a/src/Util/Strings/Ascii.v b/src/Util/Strings/Ascii.v index e846d765d5..b969dd9c87 100644 --- a/src/Util/Strings/Ascii.v +++ b/src/Util/Strings/Ascii.v @@ -1,5 +1,5 @@ -Require Import Coq.NArith.NArith. -Require Import Coq.Strings.Ascii. +From Coq Require Import NArith. +From Coq Require Import Ascii. Require Import Crypto.Util.Notations. Local Open Scope bool_scope. diff --git a/src/Util/Strings/Decimal.v b/src/Util/Strings/Decimal.v index 868242faee..af6a71dd66 100644 --- a/src/Util/Strings/Decimal.v +++ b/src/Util/Strings/Decimal.v @@ -1,8 +1,8 @@ -Require Import Coq.Strings.Ascii Coq.Strings.String. -Require Import Coq.Numbers.BinNums. -Require Import Coq.Numbers.DecimalString. -Require Coq.Numbers.DecimalN. -Require Coq.Numbers.DecimalZ. +From Coq Require Import Ascii String. +From Coq Require Import BinNums. +From Coq Require Import DecimalString. +From Coq Require DecimalN. +From Coq Require DecimalZ. Import BinPosDef. Import BinIntDef. Import BinNatDef. diff --git a/src/Util/Strings/NamingConventions.v b/src/Util/Strings/NamingConventions.v index 1f20c83a3a..c030110789 100644 --- a/src/Util/Strings/NamingConventions.v +++ b/src/Util/Strings/NamingConventions.v @@ -1,6 +1,6 @@ -Require Import Coq.derive.Derive. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String. +From Coq Require Import Derive. +From Coq Require Import List. +From Coq Require Import String. Require Import Crypto.Util.Strings.String. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Strings.Show. diff --git a/src/Util/Strings/Parse/Common.v b/src/Util/Strings/Parse/Common.v index dc1dc43836..9c0c21e744 100644 --- a/src/Util/Strings/Parse/Common.v +++ b/src/Util/Strings/Parse/Common.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.Ascii Coq.Strings.String Coq.Lists.List. +From Coq Require Import Ascii String List. Require Import Crypto.Util.Option. Require Import Crypto.Util.OptionList. Require Import Crypto.Util.Strings.String. diff --git a/src/Util/Strings/ParseArithmetic.v b/src/Util/Strings/ParseArithmetic.v index 1bece334ac..ff8b1613a7 100644 --- a/src/Util/Strings/ParseArithmetic.v +++ b/src/Util/Strings/ParseArithmetic.v @@ -1,11 +1,11 @@ -Require Import Coq.Strings.Ascii Coq.Strings.String Coq.Lists.List. -Require Import Coq.Numbers.BinNums. -Require Import Coq.QArith.QArith. -Require Import Coq.ZArith.BinInt. +From Coq Require Import Ascii String List. +From Coq Require Import BinNums. +From Coq Require Import QArith. +From Coq Require Import BinInt. Require Import Crypto.Util.Option. -Require Coq.Strings.BinaryString. -Require Coq.Strings.OctalString. -Require Coq.Strings.HexString. +From Coq Require BinaryString. +From Coq Require OctalString. +From Coq Require HexString. Require Import Crypto.Util.Strings.Decimal. Require Import Crypto.Util.Strings.Parse.Common. Require Import Crypto.Util.Option. diff --git a/src/Util/Strings/ParseArithmeticToTaps.v b/src/Util/Strings/ParseArithmeticToTaps.v index cacc9eae1a..4a4af9d798 100644 --- a/src/Util/Strings/ParseArithmeticToTaps.v +++ b/src/Util/Strings/ParseArithmeticToTaps.v @@ -1,6 +1,6 @@ -Require Import Coq.Strings.Ascii Coq.Strings.String Coq.Lists.List. -Require Import Coq.QArith.QArith_base. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Ascii String List. +From Coq Require Import QArith_base. +From Coq Require Import ZArith. Require Import Crypto.Util.Option. Require Import Crypto.Util.OptionList. Require Import Crypto.Util.Strings.ParseArithmetic. diff --git a/src/Util/Strings/ParseFlagOptions.v b/src/Util/Strings/ParseFlagOptions.v index 1d9fc1d3b4..f7ef3da3cd 100644 --- a/src/Util/Strings/ParseFlagOptions.v +++ b/src/Util/Strings/ParseFlagOptions.v @@ -1,5 +1,5 @@ -Require Import Coq.Strings.String. -Require Import Coq.Lists.List. +From Coq Require Import String. +From Coq Require Import List. Require Import Crypto.Util.Strings.String. Require Import Crypto.Util.Strings.Show. Require Crypto.Util.Tuple. diff --git a/src/Util/Strings/Show.v b/src/Util/Strings/Show.v index 071e3cbca5..2d7b482e6b 100644 --- a/src/Util/Strings/Show.v +++ b/src/Util/Strings/Show.v @@ -1,9 +1,9 @@ -Require Import Coq.ZArith.BinInt Coq.NArith.BinNat Coq.QArith.QArith_base. -Require Import Coq.Lists.List. -Require Import Coq.Strings.String Coq.Strings.Ascii. +From Coq Require Import BinInt BinNat QArith_base. +From Coq Require Import List. +From Coq Require Import String Ascii. Require Crypto.Util.Strings.String. Require Import Crypto.Util.ZUtil.Definitions. -Require Import Coq.Strings.HexString. +From Coq Require Import HexString. Require Import Crypto.Util.Strings.Decimal. Require Export Crypto.Util.Level. Import ListNotations. Local Open Scope Z_scope. Local Open Scope list_scope. Local Open Scope string_scope. diff --git a/src/Util/Strings/Sorting.v b/src/Util/Strings/Sorting.v index ca2223d6c3..b41ed142e6 100644 --- a/src/Util/Strings/Sorting.v +++ b/src/Util/Strings/Sorting.v @@ -1,7 +1,7 @@ -Require Import Coq.Strings.String. -Require Import Coq.Sorting.Mergesort. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. +From Coq Require Import String. +From Coq Require Import Mergesort. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. Require Import Crypto.Util.Strings.String_as_OT. Module Ascii_as_OTFull := OT_to_Full Ascii_as_OT <+ OTF_LtIsTotal. diff --git a/src/Util/Strings/String.v b/src/Util/Strings/String.v index dffb9b1fd9..b5c4898ca8 100644 --- a/src/Util/Strings/String.v +++ b/src/Util/Strings/String.v @@ -1,7 +1,7 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.PeanoNat. -Require Import Coq.Strings.String. -Require Import Coq.Strings.Ascii. +From Coq Require Import Lia. +From Coq Require Import PeanoNat. +From Coq Require Import String. +From Coq Require Import Ascii. Require Import Crypto.Util.Strings.Ascii. Local Open Scope list_scope. diff --git a/src/Util/Strings/StringMap.v b/src/Util/Strings/StringMap.v index 29d994d2cc..e38d844d3d 100644 --- a/src/Util/Strings/StringMap.v +++ b/src/Util/Strings/StringMap.v @@ -1,6 +1,6 @@ -Require Import Coq.FSets.FMapList. -Require Import Coq.Structures.OrderedType. -Require Import Coq.Strings.String. +From Coq Require Import FMapList. +From Coq Require Import OrderedType. +From Coq Require Import String. Require Import Crypto.Util.Strings.String_as_OT_old. Module StringMap := FMapList.Make String_as_OT. diff --git a/src/Util/Strings/String_as_OT.v b/src/Util/Strings/String_as_OT.v index 76907ba2c7..b061ed829a 100644 --- a/src/Util/Strings/String_as_OT.v +++ b/src/Util/Strings/String_as_OT.v @@ -1,8 +1,8 @@ -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. -Require Import Coq.Strings.Ascii Coq.Strings.String. -Require Import Coq.Arith.Arith. -Require Import Coq.NArith.NArith. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. +From Coq Require Import Ascii String. +From Coq Require Import Arith. +From Coq Require Import NArith. Require Export Crypto.Util.FixCoqMistakes. (** This should disappear whenever we bump the minimum version to a version where https://github.com/coq/coq/pull/14096 has been merged *) diff --git a/src/Util/Strings/String_as_OT_old.v b/src/Util/Strings/String_as_OT_old.v index 10c32a8ae0..c1b25c1ae1 100644 --- a/src/Util/Strings/String_as_OT_old.v +++ b/src/Util/Strings/String_as_OT_old.v @@ -1,8 +1,8 @@ -Require Import Coq.Structures.OrderedTypeEx. -Require Import Coq.Strings.Ascii Coq.Strings.String. -Require Import Coq.Arith.Arith. -Require Import Coq.NArith.NArith. -Require Import Coq.Structures.OrderedType. +From Coq Require Import OrderedTypeEx. +From Coq Require Import Ascii String. +From Coq Require Import Arith. +From Coq Require Import NArith. +From Coq Require Import OrderedType. Require Export Crypto.Util.FixCoqMistakes. (** This is copied verbatim from coq/theories/Structures/OrderedTypeEx.v, and should be removed once we bump the version requirement to 8.12, where we get the benefit of https://github.com/coq/coq/pull/12044 *) diff --git a/src/Util/Strings/Subscript.v b/src/Util/Strings/Subscript.v index cad965f09a..d80d2953ac 100644 --- a/src/Util/Strings/Subscript.v +++ b/src/Util/Strings/Subscript.v @@ -1,6 +1,6 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import Ascii. +From Coq Require Import String. Require Import Crypto.Util.Strings.String. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/Strings/Superscript.v b/src/Util/Strings/Superscript.v index c05a5fcabd..bb7641c7f1 100644 --- a/src/Util/Strings/Superscript.v +++ b/src/Util/Strings/Superscript.v @@ -1,6 +1,6 @@ -Require Import Coq.Lists.List. -Require Import Coq.Strings.Ascii. -Require Import Coq.Strings.String. +From Coq Require Import List. +From Coq Require Import Ascii. +From Coq Require Import String. Require Import Crypto.Util.Strings.String. Import ListNotations. Local Open Scope list_scope. diff --git a/src/Util/Structures/Equalities.v b/src/Util/Structures/Equalities.v index ec1b708716..05e5574605 100644 --- a/src/Util/Structures/Equalities.v +++ b/src/Util/Structures/Equalities.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms. +From Coq Require Import Equalities. Require Export Crypto.Util.FixCoqMistakes. Module Type UsualEqualityTypeOrig <: EqualityTypeOrig diff --git a/src/Util/Structures/Equalities/Bool.v b/src/Util/Structures/Equalities/Bool.v index cad851deb8..73bbcee8d6 100644 --- a/src/Util/Structures/Equalities/Bool.v +++ b/src/Util/Structures/Equalities/Bool.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Bool. diff --git a/src/Util/Structures/Equalities/Empty.v b/src/Util/Structures/Equalities/Empty.v index f088c59c8a..a9d5fa2b59 100644 --- a/src/Util/Structures/Equalities/Empty.v +++ b/src/Util/Structures/Equalities/Empty.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Structures.Equalities. Local Set Implicit Arguments. diff --git a/src/Util/Structures/Equalities/Iso.v b/src/Util/Structures/Equalities/Iso.v index 6c6d2e08ce..e02609e2f4 100644 --- a/src/Util/Structures/Equalities/Iso.v +++ b/src/Util/Structures/Equalities/Iso.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.GlobalSettings. Require Import Crypto.Util.FixCoqMistakes. diff --git a/src/Util/Structures/Equalities/List.v b/src/Util/Structures/Equalities/List.v index 524628b89d..e2b5782cc9 100644 --- a/src/Util/Structures/Equalities/List.v +++ b/src/Util/Structures/Equalities/List.v @@ -1,7 +1,7 @@ -Require Import Coq.Lists.List. -Require Import Coq.Lists.SetoidList. -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import List. +From Coq Require Import SetoidList. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.ListUtil. diff --git a/src/Util/Structures/Equalities/Option.v b/src/Util/Structures/Equalities/Option.v index 308def66ff..e5706a12bb 100644 --- a/src/Util/Structures/Equalities/Option.v +++ b/src/Util/Structures/Equalities/Option.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Option. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Structures.Equalities. diff --git a/src/Util/Structures/Equalities/Prod.v b/src/Util/Structures/Equalities/Prod.v index 4b5bde615f..946b79c223 100644 --- a/src/Util/Structures/Equalities/Prod.v +++ b/src/Util/Structures/Equalities/Prod.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.RelationPairs. -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import RelationPairs. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Tactics.BreakMatch. diff --git a/src/Util/Structures/Equalities/Project.v b/src/Util/Structures/Equalities/Project.v index 1e182a4fba..e863b0978b 100644 --- a/src/Util/Structures/Equalities/Project.v +++ b/src/Util/Structures/Equalities/Project.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Structures.Equalities. Local Set Implicit Arguments. diff --git a/src/Util/Structures/Equalities/Sum.v b/src/Util/Structures/Equalities/Sum.v index 3aeac3e4c5..9e1f9395e6 100644 --- a/src/Util/Structures/Equalities/Sum.v +++ b/src/Util/Structures/Equalities/Sum.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Sum. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Structures.Equalities. diff --git a/src/Util/Structures/Equalities/Unit.v b/src/Util/Structures/Equalities/Unit.v index 5ac406644a..090bc53bae 100644 --- a/src/Util/Structures/Equalities/Unit.v +++ b/src/Util/Structures/Equalities/Unit.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Unit. diff --git a/src/Util/Structures/Orders.v b/src/Util/Structures/Orders.v index 0cf97b0b74..92a3751009 100644 --- a/src/Util/Structures/Orders.v +++ b/src/Util/Structures/Orders.v @@ -1,6 +1,6 @@ -Require Import Coq.btauto.Btauto. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Btauto. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Tactics.UniquePose. Require Import Crypto.Util.Tactics.BreakMatch. @@ -109,7 +109,7 @@ Module TransitiveLeBool_of_TotalOrderBool (Import T : TotalOrderBool') <: LebIsT Qed. End TransitiveLeBool_of_TotalOrderBool. -Require Import Coq.Structures.OrderedType. +From Coq Require Import OrderedType. Module Type MiniOrderedType := MiniOrderedType. Module Type OrderedTypeOrig := OrderedType.OrderedType. diff --git a/src/Util/Structures/Orders/Bool.v b/src/Util/Structures/Orders/Bool.v index 12e40fc8fb..2f60f3f43f 100644 --- a/src/Util/Structures/Orders/Bool.v +++ b/src/Util/Structures/Orders/Bool.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities.Bool. Require Import Crypto.Util.Structures.Orders. Require Import Crypto.Util.Bool. diff --git a/src/Util/Structures/Orders/Empty.v b/src/Util/Structures/Orders/Empty.v index fe87976062..fecba3df67 100644 --- a/src/Util/Structures/Orders/Empty.v +++ b/src/Util/Structures/Orders/Empty.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities.Empty. Require Import Crypto.Util.Structures.Orders. Require Import Crypto.Util.Tactics.DestructHead. diff --git a/src/Util/Structures/Orders/Flip.v b/src/Util/Structures/Orders/Flip.v index f9f630f12f..666d5bd419 100644 --- a/src/Util/Structures/Orders/Flip.v +++ b/src/Util/Structures/Orders/Flip.v @@ -1,7 +1,7 @@ -Require Import Coq.Program.Basics. -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Basics. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities.Project. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Orders. diff --git a/src/Util/Structures/Orders/Iso.v b/src/Util/Structures/Orders/Iso.v index 148f427e8c..5fefb88037 100644 --- a/src/Util/Structures/Orders/Iso.v +++ b/src/Util/Structures/Orders/Iso.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Orders. Require Import Crypto.Util.Structures.Equalities.Iso. Require Import Crypto.Util.GlobalSettings. diff --git a/src/Util/Structures/Orders/List.v b/src/Util/Structures/Orders/List.v index 220babf0ed..950f1c3350 100644 --- a/src/Util/Structures/Orders/List.v +++ b/src/Util/Structures/Orders/List.v @@ -1,7 +1,7 @@ -Require Import Coq.Lists.List Coq.Lists.SetoidList. -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import List SetoidList. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Equalities.List. Require Import Crypto.Util.Structures.Orders. diff --git a/src/Util/Structures/Orders/Option.v b/src/Util/Structures/Orders/Option.v index e43b13b7fd..c5d8c713b3 100644 --- a/src/Util/Structures/Orders/Option.v +++ b/src/Util/Structures/Orders/Option.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities.Option. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Orders. diff --git a/src/Util/Structures/Orders/Prod.v b/src/Util/Structures/Orders/Prod.v index b8c232ba42..6bbb52fefd 100644 --- a/src/Util/Structures/Orders/Prod.v +++ b/src/Util/Structures/Orders/Prod.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Equalities.Prod. Require Import Crypto.Util.Structures.Orders. diff --git a/src/Util/Structures/Orders/Sum.v b/src/Util/Structures/Orders/Sum.v index 980cba508c..4afd334ea2 100644 --- a/src/Util/Structures/Orders/Sum.v +++ b/src/Util/Structures/Orders/Sum.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Equalities.Sum. Require Import Crypto.Util.Structures.Orders. diff --git a/src/Util/Structures/Orders/Unit.v b/src/Util/Structures/Orders/Unit.v index 4a0bb66f38..89dcb2b81f 100644 --- a/src/Util/Structures/Orders/Unit.v +++ b/src/Util/Structures/Orders/Unit.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. +From Coq Require Import Morphisms Setoid. +From Coq Require Import Equalities. +From Coq Require Import Orders. Require Import Crypto.Util.Structures.Equalities.Unit. Require Import Crypto.Util.Structures.Orders. Require Import Crypto.Util.Unit. diff --git a/src/Util/Structures/OrdersEx.v b/src/Util/Structures/OrdersEx.v index 221daba1c2..00e915e9db 100644 --- a/src/Util/Structures/OrdersEx.v +++ b/src/Util/Structures/OrdersEx.v @@ -1,8 +1,8 @@ -Require Import Coq.PArith.PArith Coq.ZArith.ZArith Coq.NArith.NArith. -Require Coq.Structures.OrderedTypeEx. -Require Import Coq.Structures.Equalities. -Require Import Coq.Structures.Orders. -Require Import Coq.Structures.OrdersEx. +From Coq Require Import PArith ZArith NArith. +From Coq Require OrderedTypeEx. +From Coq Require Import Equalities. +From Coq Require Import Orders. +From Coq Require Import OrdersEx. Require Import Crypto.Util.Structures.Equalities. Require Import Crypto.Util.Structures.Equalities.Iso. Require Import Crypto.Util.Structures.Orders. @@ -67,7 +67,7 @@ Module NIsoOptionPositive <: IsoOrderedType OptionPositiveOrderedTypeBits. End NIsoOptionPositive. Module NIsoOptionPositiveOrig <: IsoOrderedTypeOrig OptionPositiveOrderedTypeBitsOrig. - Import Structures.OrderedType. + Import OrderedType. Include NIsoOptionPositiveCommon. Definition compare (x y : t) : Compare lt eq x y. Proof. @@ -146,7 +146,7 @@ Module ZIsoSumNegN <: IsoOrderedType SumNegNOrderedTypeBits. End ZIsoSumNegN. Module ZIsoSumNegNOrig <: IsoOrderedTypeOrig SumNegNOrderedTypeBitsOrig. - Import Structures.OrderedType. + Import OrderedType. Include ZIsoSumNegNCommon. Definition compare (x y : t) : Compare lt eq x y. Proof. diff --git a/src/Util/Sum.v b/src/Util/Sum.v index 074e80c86e..9bdc7ea03d 100644 --- a/src/Util/Sum.v +++ b/src/Util/Sum.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.Tactics.SetoidSubst. diff --git a/src/Util/Tactics/ETransitivity.v b/src/Util/Tactics/ETransitivity.v index 17cabb1bab..75173b42e4 100644 --- a/src/Util/Tactics/ETransitivity.v +++ b/src/Util/Tactics/ETransitivity.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.RelationClasses. +From Coq Require Import RelationClasses. (** We call Coq's [etransitivity] for compatibility because it's more powerful than [etransitivity _] in some cases, diff --git a/src/Util/Tactics/GeneralizeOverHoles.v b/src/Util/Tactics/GeneralizeOverHoles.v index 5112b4df34..09ef34e93c 100644 --- a/src/Util/Tactics/GeneralizeOverHoles.v +++ b/src/Util/Tactics/GeneralizeOverHoles.v @@ -1,6 +1,6 @@ Require Export Crypto.Util.FixCoqMistakes. Require Import Crypto.Util.Tactics.Zeta1. -Require Import Coq.ssr.ssreflect. +From Coq Require Import ssreflect. Ltac generalize_over_holes tac := zeta1 (ltac:(let H := fresh in diff --git a/src/Util/TagList.v b/src/Util/TagList.v index 2d293adae7..6e303bc8d6 100644 --- a/src/Util/TagList.v +++ b/src/Util/TagList.v @@ -1,4 +1,4 @@ -Require Import Coq.Lists.List. +From Coq Require Import List. Require Import Crypto.Util.Notations. Import ListNotations. diff --git a/src/Util/Telescope/Core.v b/src/Util/Telescope/Core.v index 555e0f3953..5d16345227 100644 --- a/src/Util/Telescope/Core.v +++ b/src/Util/Telescope/Core.v @@ -1,4 +1,4 @@ -Require Import Coq.Relations.Relation_Definitions Coq.Classes.Morphisms. +From Coq Require Import Relation_Definitions Morphisms. Require Export Crypto.Util.FixCoqMistakes. Module Export Telescope. diff --git a/src/Util/Telescope/Equality.v b/src/Util/Telescope/Equality.v index f68cba8cd1..e88c5ed792 100644 --- a/src/Util/Telescope/Equality.v +++ b/src/Util/Telescope/Equality.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.RelationClasses Coq.Relations.Relation_Definitions Coq.Classes.Morphisms. +From Coq Require Import RelationClasses Relation_Definitions Morphisms. Require Import Crypto.Util.Telescope.Core. Require Import Crypto.Util.Telescope.Instances. Require Import Crypto.Util.Equality. diff --git a/src/Util/Telescope/Instances.v b/src/Util/Telescope/Instances.v index ab634868a6..50ce2cabcc 100644 --- a/src/Util/Telescope/Instances.v +++ b/src/Util/Telescope/Instances.v @@ -1,4 +1,4 @@ -Require Import Coq.Classes.RelationClasses Coq.Relations.Relation_Definitions Coq.Classes.Morphisms. +From Coq Require Import RelationClasses Relation_Definitions Morphisms. Require Import Crypto.Util.Telescope.Core. Module Export Telescope. diff --git a/src/Util/Tuple.v b/src/Util/Tuple.v index 8cc4c1e09f..7bd48d754f 100644 --- a/src/Util/Tuple.v +++ b/src/Util/Tuple.v @@ -1,8 +1,8 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Arith.PeanoNat. -Require Import Coq.Relations.Relation_Definitions. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import PeanoNat. +From Coq Require Import Relation_Definitions. +From Coq Require Import List. +From Coq Require Import Lia. Require Import Crypto.Util.Option. Require Import Crypto.Util.Prod. Require Import Crypto.Util.Tactics.DestructHead. @@ -1180,7 +1180,7 @@ Proof using Type. eapply nth_default_to_list'. Qed. -Require Import Coq.Lists.SetoidList. +From Coq Require Import SetoidList. Global Instance fieldwise'_Proper : forall {n A B}, Proper (pointwise_relation _ (pointwise_relation _ impl) ==> eq ==> eq ==> impl) (@fieldwise' A B n) | 10. diff --git a/src/Util/Unit.v b/src/Util/Unit.v index 637c3daebc..0a4765e0a4 100644 --- a/src/Util/Unit.v +++ b/src/Util/Unit.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Relations.Relation_Definitions. +From Coq Require Import Morphisms. +From Coq Require Import Relation_Definitions. (* an equivalence for a relation on trivial things, like [unit] *) Global Instance Equivalence_trivial {A} : Equivalence (fun _ _ : A => True). diff --git a/src/Util/Wf.v b/src/Util/Wf.v index 1eaf894741..7a06c3041b 100644 --- a/src/Util/Wf.v +++ b/src/Util/Wf.v @@ -1,9 +1,12 @@ (** * Miscellaneous Well-Foundedness Facts *) -Require Import Coq.Setoids.Setoid Coq.Program.Program Coq.Program.Wf Coq.Arith.Wf_nat Coq.Classes.Morphisms Coq.Init.Wf. -Require Import Coq.Lists.SetoidList. -Require Import Coq.Arith.PeanoNat. +From Coq Require Import Setoid Program. +From Coq.Program Require Import Wf. +From Coq Require Import Wf_nat Morphisms. +From Coq.Init Require Import Wf. +From Coq Require Import SetoidList. +From Coq Require Import PeanoNat. Require Export Crypto.Util.FixCoqMistakes. -Require Coq.Arith.EqNat. +From Coq Require EqNat. Local Set Implicit Arguments. Local Unset Uniform Inductive Parameters. diff --git a/src/Util/Wf1.v b/src/Util/Wf1.v index fb3b047938..e9c9d2d12c 100644 --- a/src/Util/Wf1.v +++ b/src/Util/Wf1.v @@ -1,5 +1,8 @@ (** * Miscellaneous Well-Foundedness Facts *) -Require Import Coq.Setoids.Setoid Coq.Program.Program Coq.Program.Wf Coq.Arith.Wf_nat Coq.Classes.Morphisms Coq.Init.Wf. +From Coq Require Import Setoid Program. +From Coq.Program Require Import Wf. +From Coq Require Import Wf_nat Morphisms. +From Coq.Init Require Import Wf. Require Import Crypto.Util.Telescope.Core. Require Import Crypto.Util.Telescope.Instances. Require Import Crypto.Util.Telescope.Equality. diff --git a/src/Util/Wf2.v b/src/Util/Wf2.v index f207c921e9..84439a6e48 100644 --- a/src/Util/Wf2.v +++ b/src/Util/Wf2.v @@ -1,5 +1,8 @@ (** * Miscellaneous Well-Foundedness Facts *) -Require Import Coq.Setoids.Setoid Coq.Program.Program Coq.Program.Wf Coq.Arith.Wf_nat Coq.Classes.Morphisms Coq.Init.Wf. +From Coq Require Import Setoid Program. +From Coq.Program Require Import Wf. +From Coq Require Import Wf_nat Morphisms. +From Coq.Init Require Import Wf. Require Import Crypto.Util.Telescope.Core. Require Import Crypto.Util.Telescope.Instances. Require Import Crypto.Util.Telescope.Equality. diff --git a/src/Util/ZBounded.v b/src/Util/ZBounded.v index 719a8bc2f0..75022aebba 100644 --- a/src/Util/ZBounded.v +++ b/src/Util/ZBounded.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import ZArith. Require Import Crypto.Util.Tuple. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.ZRange. diff --git a/src/Util/ZRange.v b/src/Util/ZRange.v index 2801e99077..0d6fbe4fc0 100644 --- a/src/Util/ZRange.v +++ b/src/Util/ZRange.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.Tuple. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.Bool.Reflect. diff --git a/src/Util/ZRange/BasicLemmas.v b/src/Util/ZRange/BasicLemmas.v index 44b20f6f1c..0bf6748f92 100644 --- a/src/Util/ZRange/BasicLemmas.v +++ b/src/Util/ZRange/BasicLemmas.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.RelationClasses. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import RelationClasses. +From Coq Require Import Lia. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. Require Import Crypto.Util.ZUtil.Hints.ZArith. diff --git a/src/Util/ZRange/CornersMonotoneBounds.v b/src/Util/ZRange/CornersMonotoneBounds.v index e2f5f8f6b3..aa6b41e73e 100644 --- a/src/Util/ZRange/CornersMonotoneBounds.v +++ b/src/Util/ZRange/CornersMonotoneBounds.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Tactics.SplitMinMax. Require Import Crypto.Util.ZUtil.Stabilization. Require Import Crypto.Util.ZUtil.MulSplit. diff --git a/src/Util/ZRange/LandLorBounds.v b/src/Util/ZRange/LandLorBounds.v index f2a5566ebe..444e357ad0 100644 --- a/src/Util/ZRange/LandLorBounds.v +++ b/src/Util/ZRange/LandLorBounds.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.LandLorBounds. Require Import Crypto.Util.ZUtil.LandLorShiftBounds. diff --git a/src/Util/ZRange/Operations.v b/src/Util/ZRange/Operations.v index 1c21f74f03..b1146fdb05 100644 --- a/src/Util/ZRange/Operations.v +++ b/src/Util/ZRange/Operations.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.Option. Require Import Crypto.Util.ZUtil.Definitions. diff --git a/src/Util/ZRange/OperationsBounds.v b/src/Util/ZRange/OperationsBounds.v index c75ffbfe26..4f7e9a61de 100644 --- a/src/Util/ZRange/OperationsBounds.v +++ b/src/Util/ZRange/OperationsBounds.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.Operations. Require Import Crypto.Util.ZRange.BasicLemmas. diff --git a/src/Util/ZRange/Show.v b/src/Util/ZRange/Show.v index 9666949faf..fe77fef19c 100644 --- a/src/Util/ZRange/Show.v +++ b/src/Util/ZRange/Show.v @@ -1,4 +1,4 @@ -Require Import Coq.Strings.String. +From Coq Require Import String. Require Import Crypto.Util.Strings.Show. Require Import Crypto.Util.ZRange. Local Open Scope string_scope. diff --git a/src/Util/ZRange/SplitBounds.v b/src/Util/ZRange/SplitBounds.v index 93d907b2f1..2531078cdd 100644 --- a/src/Util/ZRange/SplitBounds.v +++ b/src/Util/ZRange/SplitBounds.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.BasicLemmas. Require Import Crypto.Util.ZRange.Operations. diff --git a/src/Util/ZRange/SplitRangeBounds.v b/src/Util/ZRange/SplitRangeBounds.v index 968dec009d..b8550e1d5d 100644 --- a/src/Util/ZRange/SplitRangeBounds.v +++ b/src/Util/ZRange/SplitRangeBounds.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Lia. Require Import Crypto.Util.ZRange. Require Import Crypto.Util.ZRange.BasicLemmas. Require Import Crypto.Util.ZRange.Operations. diff --git a/src/Util/ZUtil.v b/src/Util/ZUtil.v index b3bbbcf3db..24d9a0c71d 100644 --- a/src/Util/ZUtil.v +++ b/src/Util/ZUtil.v @@ -1,5 +1,5 @@ -Require Coq.ZArith.Zpower Coq.ZArith.Znumtheory Coq.ZArith.ZArith Coq.ZArith.Zdiv. -Require Coq.micromega.Lia Coq.Arith.Arith. +From Coq Require Zpower Znumtheory ZArith Zdiv. +From Coq Require Lia Arith. Require Crypto.Util.ZUtil.AddGetCarry. Require Crypto.Util.ZUtil.AddModulo. Require Crypto.Util.ZUtil.CC. diff --git a/src/Util/ZUtil/AddGetCarry.v b/src/Util/ZUtil/AddGetCarry.v index 8d178b2a25..4e71060b80 100644 --- a/src/Util/ZUtil/AddGetCarry.v +++ b/src/Util/ZUtil/AddGetCarry.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Ltz. Require Import Crypto.Util.ZUtil.Hints.ZArith. diff --git a/src/Util/ZUtil/AddModulo.v b/src/Util/ZUtil/AddModulo.v index 0f80a75d97..6ebe5d948a 100644 --- a/src/Util/ZUtil/AddModulo.v +++ b/src/Util/ZUtil/AddModulo.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Definitions. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/ArithmeticShiftr.v b/src/Util/ZUtil/ArithmeticShiftr.v index 417ab9fe01..128ac6124e 100644 --- a/src/Util/ZUtil/ArithmeticShiftr.v +++ b/src/Util/ZUtil/ArithmeticShiftr.v @@ -1,6 +1,6 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Bool. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Notations. diff --git a/src/Util/ZUtil/Bitwise.v b/src/Util/ZUtil/Bitwise.v index 935ed843a1..4bb71fe1d5 100644 --- a/src/Util/ZUtil/Bitwise.v +++ b/src/Util/ZUtil/Bitwise.v @@ -1,8 +1,8 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.Arith. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Lists.List. -Require Import Coq.Bool.Bool. +From Coq Require Import Lia. +From Coq Require Import Arith. +From Coq Require Import ZArith. +From Coq Require Import List. +From Coq Require Import Bool. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.ZUtil.Stabilization. Require Import Crypto.Util.ListUtil. diff --git a/src/Util/ZUtil/CC.v b/src/Util/ZUtil/CC.v index d459b2f766..b0eaf5538a 100644 --- a/src/Util/ZUtil/CC.v +++ b/src/Util/ZUtil/CC.v @@ -1,5 +1,5 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.Tactics.DestructHead. Require Import Crypto.Util.ZUtil.Definitions. diff --git a/src/Util/ZUtil/CPS.v b/src/Util/ZUtil/CPS.v index 4c97746648..6db08dcf35 100644 --- a/src/Util/ZUtil/CPS.v +++ b/src/Util/ZUtil/CPS.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.LetIn. diff --git a/src/Util/ZUtil/Combine.v b/src/Util/ZUtil/Combine.v index 01f5ea3268..41ae2694ea 100644 --- a/src/Util/ZUtil/Combine.v +++ b/src/Util/ZUtil/Combine.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. Require Import Crypto.Util.ZUtil.Notations. diff --git a/src/Util/ZUtil/Definitions.v b/src/Util/ZUtil/Definitions.v index 1f40d191cc..19aea9df66 100644 --- a/src/Util/ZUtil/Definitions.v +++ b/src/Util/ZUtil/Definitions.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.ZUtil.Notations. Require Import Crypto.Util.LetIn. diff --git a/src/Util/ZUtil/DistrIf.v b/src/Util/ZUtil/DistrIf.v index aa7af70fef..ed6bfc551d 100644 --- a/src/Util/ZUtil/DistrIf.v +++ b/src/Util/ZUtil/DistrIf.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Div.v b/src/Util/ZUtil/Div.v index dee8de65e3..f946de86e7 100644 --- a/src/Util/ZUtil/Div.v +++ b/src/Util/ZUtil/Div.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.ZArith.Znumtheory. +From Coq Require Import ZArith Lia. +From Coq Require Import Znumtheory. Require Import Crypto.Util.ZUtil.Tactics.CompareToSgn. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. diff --git a/src/Util/ZUtil/Div/Bootstrap.v b/src/Util/ZUtil/Div/Bootstrap.v index 088a77475d..4ed0c97b15 100644 --- a/src/Util/ZUtil/Div/Bootstrap.v +++ b/src/Util/ZUtil/Div/Bootstrap.v @@ -1,6 +1,6 @@ (** Basic lemmas about [Z.div] for bootstrapping various tactics *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Divide.v b/src/Util/ZUtil/Divide.v index 679fbf8c38..24bf1ac3f2 100644 --- a/src/Util/ZUtil/Divide.v +++ b/src/Util/ZUtil/Divide.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.ZArith.Znumtheory. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Znumtheory. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Div. Require Import Crypto.Util.ZUtil.Tactics.DivideExistsMul. diff --git a/src/Util/ZUtil/Divide/Bool.v b/src/Util/ZUtil/Divide/Bool.v index f961ae8857..d784cf35ca 100644 --- a/src/Util/ZUtil/Divide/Bool.v +++ b/src/Util/ZUtil/Divide/Bool.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import ZArith. Require Import Crypto.Util.Bool.Reflect. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.Tactics.DestructHead. diff --git a/src/Util/ZUtil/EquivModulo.v b/src/Util/ZUtil/EquivModulo.v index 32423f1cbf..ccfef95b7b 100644 --- a/src/Util/ZUtil/EquivModulo.v +++ b/src/Util/ZUtil/EquivModulo.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.Structures.Equalities. -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import Equalities. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.Notations. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Hints.ZArith. diff --git a/src/Util/ZUtil/Ge.v b/src/Util/ZUtil/Ge.v index 4b92881c4f..6b75f1e8f0 100644 --- a/src/Util/ZUtil/Ge.v +++ b/src/Util/ZUtil/Ge.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.Classes.RelationClasses. +From Coq Require Import ZArith RelationClasses. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Hints.v b/src/Util/ZUtil/Hints.v index 87f0c0e4f6..1fdc39aa42 100644 --- a/src/Util/ZUtil/Hints.v +++ b/src/Util/ZUtil/Hints.v @@ -1,5 +1,5 @@ (** * Hint Databases with lemmas about ℤ from the standard library *) -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Export Crypto.Util.ZUtil.Hints.Core. Require Export Crypto.Util.ZUtil.Hints.ZArith. Require Export Crypto.Util.ZUtil.Hints.Ztestbit. diff --git a/src/Util/ZUtil/Hints/Core.v b/src/Util/ZUtil/Hints/Core.v index c8e647641f..6674686124 100644 --- a/src/Util/ZUtil/Hints/Core.v +++ b/src/Util/ZUtil/Hints/Core.v @@ -1,7 +1,7 @@ (** * Declaration of Hint Databases with lemmas about ℤ from the standard library *) -Require Import Coq.micromega.Lia Coq.micromega.Lqa. -Require Import Coq.ZArith.ZArith. -(* Should we [Require Import Coq.ZArith.Zhints.]? *) +From Coq Require Import Lia Lqa. +From Coq Require Import ZArith. +(* Should we [From Coq Require Import Zhints.]? *) Global Hint Extern 1 => lia : lia. Global Hint Extern 1 => lra : lra. diff --git a/src/Util/ZUtil/Hints/PullPush.v b/src/Util/ZUtil/Hints/PullPush.v index 55e65303a9..708825dd4f 100644 --- a/src/Util/ZUtil/Hints/PullPush.v +++ b/src/Util/ZUtil/Hints/PullPush.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Export Crypto.Util.ZUtil.Hints.Core. (** "push" means transform [-f x] to [f (-x)]; "pull" means go the other way *) diff --git a/src/Util/ZUtil/Hints/ZArith.v b/src/Util/ZUtil/Hints/ZArith.v index 29e09b906c..b23c6f2cf4 100644 --- a/src/Util/ZUtil/Hints/ZArith.v +++ b/src/Util/ZUtil/Hints/ZArith.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Export Crypto.Util.ZUtil.Hints.Core. Global Hint Resolve Z.log2_nonneg Z.log2_up_nonneg Z.div_small Z.mod_small Z.pow_neg_r Z.pow_0_l Z.pow_pos_nonneg Z.lt_le_incl Z.pow_nonzero Z.div_le_upper_bound Z_div_exact_full_2 Z.div_same Z.div_lt_upper_bound Z.div_le_lower_bound Zplus_minus Zplus_gt_compat_l Zplus_gt_compat_r Zmult_gt_compat_l Zmult_gt_compat_r Z.pow_lt_mono_r Z.pow_lt_mono_l Z.pow_lt_mono Z.mul_lt_mono_nonneg Z.div_lt_upper_bound Z.div_pos Zmult_lt_compat_r Z.pow_le_mono_r Z.pow_le_mono_l Z.div_lt Z.div_le_compat_l Z.div_le_mono Z.max_le_compat Z.min_le_compat Z.log2_up_le_mono Z.pow_nonneg : zarith. diff --git a/src/Util/ZUtil/Hints/Ztestbit.v b/src/Util/ZUtil/Hints/Ztestbit.v index 710acbdcb1..f30060f876 100644 --- a/src/Util/ZUtil/Hints/Ztestbit.v +++ b/src/Util/ZUtil/Hints/Ztestbit.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Export Crypto.Util.ZUtil.Hints.Core. #[global] diff --git a/src/Util/ZUtil/Land.v b/src/Util/ZUtil/Land.v index 8a48ce9570..ecf4bfd414 100644 --- a/src/Util/ZUtil/Land.v +++ b/src/Util/ZUtil/Land.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Bool.Bool. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import Bool. Require Import Crypto.Util.ZUtil.Notations. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Hints.Core. diff --git a/src/Util/ZUtil/Land/Fold.v b/src/Util/ZUtil/Land/Fold.v index 62b682e2cb..e4d1996f41 100644 --- a/src/Util/ZUtil/Land/Fold.v +++ b/src/Util/ZUtil/Land/Fold.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Lists.List. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import List. Require Import Crypto.Util.ZUtil.Land. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope bool_scope. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/LandLorBounds.v b/src/Util/ZUtil/LandLorBounds.v index 43d071b2b3..704e827815 100644 --- a/src/Util/ZUtil/LandLorBounds.v +++ b/src/Util/ZUtil/LandLorBounds.v @@ -1,6 +1,6 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Pow2. Require Import Crypto.Util.ZUtil.Log2. diff --git a/src/Util/ZUtil/LandLorShiftBounds.v b/src/Util/ZUtil/LandLorShiftBounds.v index a946fd06f5..e00e467af7 100644 --- a/src/Util/ZUtil/LandLorShiftBounds.v +++ b/src/Util/ZUtil/LandLorShiftBounds.v @@ -1,6 +1,6 @@ -Require Import Coq.Classes.Morphisms. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Hints.ZArith. Require Import Crypto.Util.ZUtil.Definitions. diff --git a/src/Util/ZUtil/Le.v b/src/Util/ZUtil/Le.v index a6a9ef5049..d582bb0fa8 100644 --- a/src/Util/ZUtil/Le.v +++ b/src/Util/ZUtil/Le.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Lnot.v b/src/Util/ZUtil/Lnot.v index c4c747c76b..a48284c164 100644 --- a/src/Util/ZUtil/Lnot.v +++ b/src/Util/ZUtil/Lnot.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Local Open Scope Z_scope. Module Z. diff --git a/src/Util/ZUtil/LnotModulo.v b/src/Util/ZUtil/LnotModulo.v index 2f44458589..93479c95ba 100644 --- a/src/Util/ZUtil/LnotModulo.v +++ b/src/Util/ZUtil/LnotModulo.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Definitions. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Log2.v b/src/Util/ZUtil/Log2.v index 71d88501e9..7accaf04b6 100644 --- a/src/Util/ZUtil/Log2.v +++ b/src/Util/ZUtil/Log2.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Hints.ZArith. diff --git a/src/Util/ZUtil/Lor.v b/src/Util/ZUtil/Lor.v index 88ca8a952a..2f8710f2ee 100644 --- a/src/Util/ZUtil/Lor.v +++ b/src/Util/ZUtil/Lor.v @@ -1,6 +1,6 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Bool. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Notations. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Hints.Core. diff --git a/src/Util/ZUtil/Ltz.v b/src/Util/ZUtil/Ltz.v index a31e1b6666..5353ea68a5 100644 --- a/src/Util/ZUtil/Ltz.v +++ b/src/Util/ZUtil/Ltz.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Modulo.PullPush. Require Import Crypto.Util.ZUtil.Hints.ZArith. diff --git a/src/Util/ZUtil/Lxor.v b/src/Util/ZUtil/Lxor.v index b97a312ae8..24d28272dc 100644 --- a/src/Util/ZUtil/Lxor.v +++ b/src/Util/ZUtil/Lxor.v @@ -1,7 +1,7 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Bool.Bool. -Require Import Coq.btauto.Btauto. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import Bool. +From Coq Require Import Btauto. Require Import Crypto.Util.ZUtil.Notations. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Hints.Core. diff --git a/src/Util/ZUtil/ModExp.v b/src/Util/ZUtil/ModExp.v index 5d11e72f36..11889070c7 100644 --- a/src/Util/ZUtil/ModExp.v +++ b/src/Util/ZUtil/ModExp.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Lists.List. Local Open Scope Z. diff --git a/src/Util/ZUtil/ModInv.v b/src/Util/ZUtil/ModInv.v index bad00b0c7b..22b7e0f39a 100644 --- a/src/Util/ZUtil/ModInv.v +++ b/src/Util/ZUtil/ModInv.v @@ -1,7 +1,7 @@ (*** Compute the modular inverse of a ℤ *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.Logic.Eqdep_dec. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Eqdep_dec. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.ZUtil.Tactics.RewriteModSmall. Require Import Crypto.Util.Tactics.BreakMatch. diff --git a/src/Util/ZUtil/Modulo.v b/src/Util/ZUtil/Modulo.v index 6f385b8d05..0600da948b 100644 --- a/src/Util/ZUtil/Modulo.v +++ b/src/Util/ZUtil/Modulo.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia Coq.ZArith.Znumtheory Coq.ZArith.Zpow_facts. +From Coq Require Import ZArith Lia Znumtheory Zpow_facts. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.ZSimplify.Core. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. diff --git a/src/Util/ZUtil/Modulo/Bootstrap.v b/src/Util/ZUtil/Modulo/Bootstrap.v index 2653c30c0f..3ff2ac2790 100644 --- a/src/Util/ZUtil/Modulo/Bootstrap.v +++ b/src/Util/ZUtil/Modulo/Bootstrap.v @@ -1,6 +1,6 @@ (** Basic lemmas about [Z.modulo] for bootstrapping various tactics *) -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Modulo/PullPush.v b/src/Util/ZUtil/Modulo/PullPush.v index fc8aba6aac..cd413051bc 100644 --- a/src/Util/ZUtil/Modulo/PullPush.v +++ b/src/Util/ZUtil/Modulo/PullPush.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.ZArith.Znumtheory Coq.ZArith.Zpow_facts. +From Coq Require Import ZArith Lia. +From Coq Require Import Znumtheory Zpow_facts. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.ZSimplify.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Morphisms.v b/src/Util/ZUtil/Morphisms.v index 8bad8fe4a1..e0324aa249 100644 --- a/src/Util/ZUtil/Morphisms.v +++ b/src/Util/ZUtil/Morphisms.v @@ -1,8 +1,8 @@ (** * [Proper] morphisms for ℤ constants *) -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. -Require Import Coq.Classes.Morphisms. -Require Import Coq.Classes.RelationPairs. +From Coq Require Import Lia. +From Coq Require Import ZArith. +From Coq Require Import Morphisms. +From Coq Require Import RelationPairs. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Div. Require Import Crypto.Util.ZUtil.LandLorBounds. diff --git a/src/Util/ZUtil/Mul.v b/src/Util/ZUtil/Mul.v index 6cf851e4e6..be929eb155 100644 --- a/src/Util/ZUtil/Mul.v +++ b/src/Util/ZUtil/Mul.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Local Open Scope Z_scope. Module Z. diff --git a/src/Util/ZUtil/MulSplit.v b/src/Util/ZUtil/MulSplit.v index 120e22d207..19e4ecd9e0 100644 --- a/src/Util/ZUtil/MulSplit.v +++ b/src/Util/ZUtil/MulSplit.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Tactics.LtbToLt. Require Import Crypto.Util.Tactics.BreakMatch. diff --git a/src/Util/ZUtil/N2Z.v b/src/Util/ZUtil/N2Z.v index dec3b7da4f..6bc5c1d287 100644 --- a/src/Util/ZUtil/N2Z.v +++ b/src/Util/ZUtil/N2Z.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Nat2Z.v b/src/Util/ZUtil/Nat2Z.v index 2d10b3f1db..50f39ece3f 100644 --- a/src/Util/ZUtil/Nat2Z.v +++ b/src/Util/ZUtil/Nat2Z.v @@ -1,6 +1,6 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.Arith.Arith. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import Arith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Hints.PullPush. Module Nat2Z. diff --git a/src/Util/ZUtil/Notations.v b/src/Util/ZUtil/Notations.v index 31549e7874..a7733e1e5c 100644 --- a/src/Util/ZUtil/Notations.v +++ b/src/Util/ZUtil/Notations.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.BinInt. +From Coq Require Import BinInt. Require Import Crypto.Util.Notations. Infix ">>" := Z.shiftr : Z_scope. diff --git a/src/Util/ZUtil/Odd.v b/src/Util/ZUtil/Odd.v index 57d49f6577..8ed18ccc78 100644 --- a/src/Util/ZUtil/Odd.v +++ b/src/Util/ZUtil/Odd.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.ZArith.Znumtheory. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Znumtheory. +From Coq Require Import Lia. Local Open Scope Z_scope. Module Z. diff --git a/src/Util/ZUtil/Ones.v b/src/Util/ZUtil/Ones.v index 576044eb15..4e5d968a08 100644 --- a/src/Util/ZUtil/Ones.v +++ b/src/Util/ZUtil/Ones.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Pow2. Require Import Crypto.Util.ZUtil.Log2. Require Import Crypto.Util.ZUtil.Lnot. diff --git a/src/Util/ZUtil/OnesFrom.v b/src/Util/ZUtil/OnesFrom.v index ecbb6c7c61..46aa039a40 100644 --- a/src/Util/ZUtil/OnesFrom.v +++ b/src/Util/ZUtil/OnesFrom.v @@ -1,5 +1,5 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Bool. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Testbit. diff --git a/src/Util/ZUtil/Opp.v b/src/Util/ZUtil/Opp.v index d00e2b1178..15606e2985 100644 --- a/src/Util/ZUtil/Opp.v +++ b/src/Util/ZUtil/Opp.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.ZSimplify.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Peano.v b/src/Util/ZUtil/Peano.v index fb534ba0b7..88d362b9d0 100644 --- a/src/Util/ZUtil/Peano.v +++ b/src/Util/ZUtil/Peano.v @@ -1,6 +1,6 @@ (** * Basic Peano-arithmetic-like properties of ℤ *) -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.BinInt. +From Coq Require Import Lia. +From Coq Require Import BinInt. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.HProp. Require Import Crypto.Util.Decidable. diff --git a/src/Util/ZUtil/Pow.v b/src/Util/ZUtil/Pow.v index 84f6f88308..986e7a94b6 100644 --- a/src/Util/ZUtil/Pow.v +++ b/src/Util/ZUtil/Pow.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ListUtil. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Pow2.v b/src/Util/ZUtil/Pow2.v index 54bd50dc34..0995c4fff0 100644 --- a/src/Util/ZUtil/Pow2.v +++ b/src/Util/ZUtil/Pow2.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import ZArith. Local Open Scope Z_scope. Module Z. diff --git a/src/Util/ZUtil/Pow2Mod.v b/src/Util/ZUtil/Pow2Mod.v index 641ac66efc..9186bf16e8 100644 --- a/src/Util/ZUtil/Pow2Mod.v +++ b/src/Util/ZUtil/Pow2Mod.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Notations. Require Import Crypto.Util.ZUtil.Hints.Core. diff --git a/src/Util/ZUtil/Quot.v b/src/Util/ZUtil/Quot.v index 132cde7a2c..9fe9b52e9d 100644 --- a/src/Util/ZUtil/Quot.v +++ b/src/Util/ZUtil/Quot.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Sgn. Require Import Crypto.Util.ZUtil.Modulo. diff --git a/src/Util/ZUtil/Rshi.v b/src/Util/ZUtil/Rshi.v index 2fcb245216..4e967a6cd8 100644 --- a/src/Util/ZUtil/Rshi.v +++ b/src/Util/ZUtil/Rshi.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.Tactics.BreakMatch. Require Import Crypto.Util.ZUtil.ZSimplify. Require Import Crypto.Util.ZUtil.ZSimplify.Core. diff --git a/src/Util/ZUtil/Sgn.v b/src/Util/ZUtil/Sgn.v index a19fb280c2..2a9dda6f53 100644 --- a/src/Util/ZUtil/Sgn.v +++ b/src/Util/ZUtil/Sgn.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Shift.v b/src/Util/ZUtil/Shift.v index d590aa4103..c59cff60ee 100644 --- a/src/Util/ZUtil/Shift.v +++ b/src/Util/ZUtil/Shift.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Ones. Require Import Crypto.Util.ZUtil.Definitions. diff --git a/src/Util/ZUtil/SignBit.v b/src/Util/ZUtil/SignBit.v index 10fc412232..4fc162a7b8 100644 --- a/src/Util/ZUtil/SignBit.v +++ b/src/Util/ZUtil/SignBit.v @@ -1,6 +1,6 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Bool. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Notations. diff --git a/src/Util/ZUtil/Sorting.v b/src/Util/ZUtil/Sorting.v index 4876ba5026..8c8282aaf9 100644 --- a/src/Util/ZUtil/Sorting.v +++ b/src/Util/ZUtil/Sorting.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. -Require Import Coq.Sorting.Mergesort Coq.Structures.Orders. +From Coq Require Import ZArith Lia. +From Coq Require Import Mergesort Orders. Module Z. Module Order <: TotalLeBool. diff --git a/src/Util/ZUtil/Stabilization.v b/src/Util/ZUtil/Stabilization.v index 36436479e3..2cbe0ceee9 100644 --- a/src/Util/ZUtil/Stabilization.v +++ b/src/Util/ZUtil/Stabilization.v @@ -1,6 +1,6 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. -Require Import Coq.Classes.Morphisms. +From Coq Require Import ZArith. +From Coq Require Import Lia. +From Coq Require Import Morphisms. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Hints.ZArith. Require Import Crypto.Util.ZUtil.Tactics.ReplaceNegWithPos. diff --git a/src/Util/ZUtil/Tactics/CompareToSgn.v b/src/Util/ZUtil/Tactics/CompareToSgn.v index 31588815bc..b52db5261d 100644 --- a/src/Util/ZUtil/Tactics/CompareToSgn.v +++ b/src/Util/ZUtil/Tactics/CompareToSgn.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Module Z. Ltac compare_to_sgn := repeat match goal with diff --git a/src/Util/ZUtil/Tactics/DivModToQuotRem.v b/src/Util/ZUtil/Tactics/DivModToQuotRem.v index a52798d200..0951aa32ea 100644 --- a/src/Util/ZUtil/Tactics/DivModToQuotRem.v +++ b/src/Util/ZUtil/Tactics/DivModToQuotRem.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Div.Bootstrap. Require Import Crypto.Util.ZUtil.Modulo.Bootstrap. Require Import Crypto.Util.ZUtil.Hints.Core. diff --git a/src/Util/ZUtil/Tactics/DivideExistsMul.v b/src/Util/ZUtil/Tactics/DivideExistsMul.v index 7eec301b8b..93beba3e1b 100644 --- a/src/Util/ZUtil/Tactics/DivideExistsMul.v +++ b/src/Util/ZUtil/Tactics/DivideExistsMul.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Local Open Scope Z_scope. Module Z. diff --git a/src/Util/ZUtil/Tactics/LinearSubstitute.v b/src/Util/ZUtil/Tactics/LinearSubstitute.v index e0eff5f1b5..67fcb4d906 100644 --- a/src/Util/ZUtil/Tactics/LinearSubstitute.v +++ b/src/Util/ZUtil/Tactics/LinearSubstitute.v @@ -1,4 +1,4 @@ -Require Import Coq.micromega.Lia Coq.ZArith.ZArith. +From Coq Require Import Lia ZArith. Require Import Crypto.Util.Tactics.Contains. Require Import Crypto.Util.Tactics.Not. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Tactics/LtbToLt.v b/src/Util/ZUtil/Tactics/LtbToLt.v index 80a7b47817..8bba4e8030 100644 --- a/src/Util/ZUtil/Tactics/LtbToLt.v +++ b/src/Util/ZUtil/Tactics/LtbToLt.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.Bool. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Tactics/PeelLe.v b/src/Util/ZUtil/Tactics/PeelLe.v index 11ae2f87da..6bf209179e 100644 --- a/src/Util/ZUtil/Tactics/PeelLe.v +++ b/src/Util/ZUtil/Tactics/PeelLe.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope Z. diff --git a/src/Util/ZUtil/Tactics/PrimeBound.v b/src/Util/ZUtil/Tactics/PrimeBound.v index 45636b35db..a3a26d0fa6 100644 --- a/src/Util/ZUtil/Tactics/PrimeBound.v +++ b/src/Util/ZUtil/Tactics/PrimeBound.v @@ -1,4 +1,4 @@ -Require Import Coq.micromega.Lia Coq.ZArith.Znumtheory. +From Coq Require Import Lia Znumtheory. Module Z. Ltac prime_bound := match goal with diff --git a/src/Util/ZUtil/Tactics/PullPush/Modulo.v b/src/Util/ZUtil/Tactics/PullPush/Modulo.v index fe0c3224c6..b291de78c6 100644 --- a/src/Util/ZUtil/Tactics/PullPush/Modulo.v +++ b/src/Util/ZUtil/Tactics/PullPush/Modulo.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Modulo.PullPush. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Tactics/ReplaceNegWithPos.v b/src/Util/ZUtil/Tactics/ReplaceNegWithPos.v index 4770004bf9..1df91103d6 100644 --- a/src/Util/ZUtil/Tactics/ReplaceNegWithPos.v +++ b/src/Util/ZUtil/Tactics/ReplaceNegWithPos.v @@ -1,4 +1,4 @@ -Require Import Coq.micromega.Lia Coq.ZArith.ZArith. +From Coq Require Import Lia ZArith. Local Open Scope Z_scope. Module Z. diff --git a/src/Util/ZUtil/Tactics/RewriteModDivide.v b/src/Util/ZUtil/Tactics/RewriteModDivide.v index 1f01d3401e..17395201d6 100644 --- a/src/Util/ZUtil/Tactics/RewriteModDivide.v +++ b/src/Util/ZUtil/Tactics/RewriteModDivide.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Divide. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Tactics/RewriteModSmall.v b/src/Util/ZUtil/Tactics/RewriteModSmall.v index 7fb7bed030..d8bde755ae 100644 --- a/src/Util/ZUtil/Tactics/RewriteModSmall.v +++ b/src/Util/ZUtil/Tactics/RewriteModSmall.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Hints.ZArith. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. diff --git a/src/Util/ZUtil/Tactics/SimplifyFractionsLe.v b/src/Util/ZUtil/Tactics/SimplifyFractionsLe.v index c5b024ecae..e23c331000 100644 --- a/src/Util/ZUtil/Tactics/SimplifyFractionsLe.v +++ b/src/Util/ZUtil/Tactics/SimplifyFractionsLe.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Tactics.ZeroBounds. Require Import Crypto.Util.ZUtil.Div. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Tactics/SolveRange.v b/src/Util/ZUtil/Tactics/SolveRange.v index 8aa1b5c3cf..2231394b34 100644 --- a/src/Util/ZUtil/Tactics/SolveRange.v +++ b/src/Util/ZUtil/Tactics/SolveRange.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Pow. Require Import Crypto.Util.ZUtil.Div. diff --git a/src/Util/ZUtil/Tactics/SolveTestbit.v b/src/Util/ZUtil/Tactics/SolveTestbit.v index e5517e2ebd..1b483c8c96 100644 --- a/src/Util/ZUtil/Tactics/SolveTestbit.v +++ b/src/Util/ZUtil/Tactics/SolveTestbit.v @@ -1,6 +1,6 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Bool. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Log2. Require Import Crypto.Util.ZUtil.Testbit. diff --git a/src/Util/ZUtil/Tactics/SplitMinMax.v b/src/Util/ZUtil/Tactics/SplitMinMax.v index b84097c6aa..ca1997ce5a 100644 --- a/src/Util/ZUtil/Tactics/SplitMinMax.v +++ b/src/Util/ZUtil/Tactics/SplitMinMax.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import ZArith. Ltac rewrite_min_max_side_condition_t := lia. diff --git a/src/Util/ZUtil/Tactics/ZeroBounds.v b/src/Util/ZUtil/Tactics/ZeroBounds.v index 71a4602ea9..b64a21f7c4 100644 --- a/src/Util/ZUtil/Tactics/ZeroBounds.v +++ b/src/Util/ZUtil/Tactics/ZeroBounds.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Tactics.PrimeBound. Require Import Crypto.Util.ZUtil.Div. Require Import Crypto.Util.ZUtil.Le. diff --git a/src/Util/ZUtil/Tactics/Ztestbit.v b/src/Util/ZUtil/Tactics/Ztestbit.v index d12de53306..a192a3bcb0 100644 --- a/src/Util/ZUtil/Tactics/Ztestbit.v +++ b/src/Util/ZUtil/Tactics/Ztestbit.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Testbit. Require Import Crypto.Util.ZUtil.Hints.Core. diff --git a/src/Util/ZUtil/Testbit.v b/src/Util/ZUtil/Testbit.v index 671abb50b0..8d1c844747 100644 --- a/src/Util/ZUtil/Testbit.v +++ b/src/Util/ZUtil/Testbit.v @@ -1,5 +1,5 @@ -Require Import Coq.micromega.Lia. -Require Import Coq.ZArith.ZArith. +From Coq Require Import Lia. +From Coq Require Import ZArith. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Hints. Require Import Crypto.Util.ZUtil.Notations. diff --git a/src/Util/ZUtil/TruncatingShiftl.v b/src/Util/ZUtil/TruncatingShiftl.v index 958aad452c..ad102cc2b9 100644 --- a/src/Util/ZUtil/TruncatingShiftl.v +++ b/src/Util/ZUtil/TruncatingShiftl.v @@ -1,5 +1,5 @@ -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Notations. Require Import Crypto.Util.ZUtil.Pow. diff --git a/src/Util/ZUtil/TwosComplement.v b/src/Util/ZUtil/TwosComplement.v index c123dbdb01..2990bec8d4 100644 --- a/src/Util/ZUtil/TwosComplement.v +++ b/src/Util/ZUtil/TwosComplement.v @@ -1,6 +1,6 @@ -Require Import Coq.Bool.Bool. -Require Import Coq.ZArith.ZArith. -Require Import Coq.micromega.Lia. +From Coq Require Import Bool. +From Coq Require Import ZArith. +From Coq Require Import Lia. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.ZUtil.Pow. diff --git a/src/Util/ZUtil/Z2Nat.v b/src/Util/ZUtil/Z2Nat.v index fb56d76e3f..f651b56cf2 100644 --- a/src/Util/ZUtil/Z2Nat.v +++ b/src/Util/ZUtil/Z2Nat.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Local Open Scope Z_scope. Module Z2Nat. diff --git a/src/Util/ZUtil/ZSimplify/Autogenerated.v b/src/Util/ZUtil/ZSimplify/Autogenerated.v index 98bf18441b..2dfbc1a6ae 100644 --- a/src/Util/ZUtil/ZSimplify/Autogenerated.v +++ b/src/Util/ZUtil/ZSimplify/Autogenerated.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/ZSimplify/Core.v b/src/Util/ZUtil/ZSimplify/Core.v index 7bb20c5df3..f0e148e189 100644 --- a/src/Util/ZUtil/ZSimplify/Core.v +++ b/src/Util/ZUtil/ZSimplify/Core.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Export Crypto.Util.ZUtil.Hints.Core. #[global] diff --git a/src/Util/ZUtil/ZSimplify/Simple.v b/src/Util/ZUtil/ZSimplify/Simple.v index 4d76f18347..0b6132588e 100644 --- a/src/Util/ZUtil/ZSimplify/Simple.v +++ b/src/Util/ZUtil/ZSimplify/Simple.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith Coq.micromega.Lia. +From Coq Require Import ZArith Lia. Require Import Crypto.Util.ZUtil.Hints.Core. Local Open Scope Z_scope. diff --git a/src/Util/ZUtil/Zselect.v b/src/Util/ZUtil/Zselect.v index 3300cbd6e5..4837f23324 100644 --- a/src/Util/ZUtil/Zselect.v +++ b/src/Util/ZUtil/Zselect.v @@ -1,4 +1,4 @@ -Require Import Coq.ZArith.ZArith. +From Coq Require Import ZArith. Require Import Crypto.Util.Decidable. Require Import Crypto.Util.ZUtil.Definitions. Require Import Crypto.Util.Tactics.BreakMatch.