Skip to content

Commit 4f5db4c

Browse files
committed
1 parent d248a7d commit 4f5db4c

File tree

455 files changed

+1301
-1285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

455 files changed

+1301
-1285
lines changed

src/AbstractInterpretation/AbstractInterpretation.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Require Import Coq.ZArith.ZArith.
1+
From Coq Require Import ZArith.
22
Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.ListUtil.FoldBool.
33
Require Import Crypto.Util.ZRange.
44
Require Import Crypto.Util.ZRange.Operations.

src/AbstractInterpretation/Proofs.v

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Require Import Coq.micromega.Lia.
2-
Require Import Coq.ZArith.ZArith.
3-
Require Import Coq.Classes.Morphisms.
4-
Require Import Coq.Classes.RelationPairs.
5-
Require Import Coq.Relations.Relations.
1+
From Coq Require Import Lia.
2+
From Coq Require Import ZArith.
3+
From Coq Require Import Morphisms.
4+
From Coq Require Import RelationPairs.
5+
From Coq Require Import Relations.
66
Require Import Crypto.Util.ZRange.
77
Require Import Crypto.Util.ZRange.Operations.
88
Require Import Crypto.Util.ZRange.BasicLemmas.

src/AbstractInterpretation/Wf.v

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Require Import Coq.micromega.Lia.
2-
Require Import Coq.ZArith.ZArith.
3-
Require Import Coq.Classes.Morphisms.
4-
Require Import Coq.Classes.RelationPairs.
5-
Require Import Coq.Relations.Relations.
1+
From Coq Require Import Lia.
2+
From Coq Require Import ZArith.
3+
From Coq Require Import Morphisms.
4+
From Coq Require Import RelationPairs.
5+
From Coq Require Import Relations.
66
Require Import Crypto.Util.ZRange.
77
Require Import Crypto.Util.Sum.
88
Require Import Crypto.Util.LetIn.

src/AbstractInterpretation/ZRange.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Require Import Coq.micromega.Lia.
2-
Require Import Coq.ZArith.ZArith.
1+
From Coq Require Import Lia.
2+
From Coq Require Import ZArith.
33
Require Import Crypto.Util.ListUtil Coq.Lists.List Crypto.Util.ListUtil.FoldBool.
44
Require Import Crypto.Util.ZRange.
55
Require Import Crypto.Util.ZRange.Operations.

src/AbstractInterpretation/ZRangeCommonProofs.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(* Proofs shared by Wf and Proofs *)
2-
Require Import Coq.Classes.Morphisms.
3-
Require Import Coq.Relations.Relations.
2+
From Coq Require Import Morphisms.
3+
From Coq Require Import Relations.
44
Require Import Crypto.Util.ZRange.
55
Require Import Crypto.Util.Option.
66
Require Import Crypto.Util.ListUtil.

src/AbstractInterpretation/ZRangeProofs.v

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
Require Import Coq.micromega.Lia.
2-
Require Import Coq.ZArith.ZArith.
3-
Require Import Coq.Classes.Morphisms.
4-
Require Import Coq.Classes.RelationPairs.
5-
Require Import Coq.Relations.Relations.
6-
Require Import Coq.Lists.List.
1+
From Coq Require Import Lia.
2+
From Coq Require Import ZArith.
3+
From Coq Require Import Morphisms.
4+
From Coq Require Import RelationPairs.
5+
From Coq Require Import Relations.
6+
From Coq Require Import List.
77
Require Import Crypto.Util.ZRange.
88
Require Import Crypto.Util.ZRange.Operations.
99
Require Import Crypto.Util.ZRange.BasicLemmas.

src/Algebra/Field.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Require Import Crypto.Util.Relations Crypto.Util.Notations.
22
Require Import Crypto.Util.Tactics.UniquePose.
33
Require Import Crypto.Util.Tactics.DebugPrint.
4-
Require Import Coq.Classes.RelationClasses Coq.Classes.Morphisms.
4+
From Coq Require Import RelationClasses Morphisms.
55
Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Ring Crypto.Algebra.IntegralDomain.
6-
Require Coq.setoid_ring.Field_theory.
6+
From Coq Require Field_theory.
77

88
Section Field.
99
Context {T eq zero one opp add mul sub inv div} `{@field T eq zero one opp add sub mul inv div}.

src/Algebra/Field_test.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Require Import Coq.PArith.BinPosDef.
1+
From Coq Require Import BinPosDef.
22
Require Import Crypto.Util.Decidable Crypto.Util.Notations.
33
Require Import Crypto.Algebra.Ring Crypto.Algebra.Field.
44

src/Algebra/Group.v

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Require Import Coq.Classes.Morphisms Crypto.Util.Relations (*Crypto.Util.Tactics*).
1+
From Coq Require Import Morphisms.
2+
Require Import Crypto.Util.Relations (*Crypto.Util.Tactics*).
23
Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Monoid.
34

45
Section BasicProperties.

src/Algebra/Hierarchy.v

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Require Export Crypto.Util.FixCoqMistakes.
22
Require Export Crypto.Util.Decidable.
33

4-
Require Coq.PArith.BinPos.
5-
Require Import Coq.Classes.Morphisms.
4+
From Coq Require BinPos.
5+
From Coq Require Import Morphisms.
66

7-
Require Coq.Lists.List.
7+
From Coq Require List.
88

99
Local Close Scope nat_scope. Local Close Scope type_scope. Local Close Scope core_scope.
1010

src/Algebra/IntegralDomain.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Require Coq.setoid_ring.Integral_domain.
1+
From Coq Require Integral_domain.
22
Require Crypto.Algebra.Nsatz.
33
Require Import Crypto.Util.Factorize.
44
Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Ring.

src/Algebra/Monoid.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Require Import Coq.Classes.Morphisms.
1+
From Coq Require Import Morphisms.
22
Require Import Crypto.Util.Tactics.RewriteHyp.
33
Require Import Crypto.Algebra.Hierarchy.
44

src/Algebra/Nsatz.v

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
periodically check whether we still need it -- once enough bugs get fixed
33
in mailine, we hope to drop this implementation *)
44

5-
Require Coq.nsatz.NsatzTactic.
6-
Require Import Coq.Lists.List.
5+
From Coq Require NsatzTactic.
6+
From Coq Require Import List.
77

88
(** For compat with https://github.com/coq/coq/pull/12073 *)
99
Module Nsatz.
@@ -50,7 +50,7 @@ Ltac nsatz_get_reified_givens reified_package :=
5050
Ltac nsatz_get_reified_goal reified_package :=
5151
lazymatch reified_package with (_, _, ?goal) => goal end.
5252

53-
Require Import Coq.setoid_ring.Ring_polynom.
53+
From Coq Require Import Ring_polynom.
5454
(* Kludge for 8.4/8.5 compatibility *)
5555
Module Import mynsatz_compute.
5656
Import Coq.nsatz.NsatzTactic.

src/Algebra/Ring.v

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
Require Coq.setoid_ring.Ncring.
2-
Require Coq.setoid_ring.Cring.
3-
Require Import Coq.Classes.Morphisms.
4-
Require Import Coq.micromega.Lia.
1+
From Coq Require Ncring.
2+
From Coq Require Cring.
3+
From Coq Require Import Morphisms.
4+
From Coq Require Import Lia.
55
Require Import Crypto.Util.Tactics.BreakMatch.
66
Require Import Crypto.Util.Tactics.OnSubterms.
77
Require Import Crypto.Util.Tactics.Revert.
88
Require Import Crypto.Util.Tactics.RewriteHyp.
99
Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Group Crypto.Algebra.Monoid.
10-
Require Coq.ZArith.ZArith Coq.PArith.PArith.
10+
From Coq Require ZArith PArith.
1111

1212

1313
Section Ring.
@@ -451,7 +451,7 @@ Definition char_ge
451451
Existing Class char_ge.
452452

453453
(*** Tactics for ring equations *)
454-
Require Export Coq.setoid_ring.Ring_tac.
454+
From Coq Require Export Ring_tac.
455455
Ltac ring_simplify_subterms := tac_on_subterms ltac:(fun t => ring_simplify t).
456456

457457
Ltac ring_simplify_subterms_in_all :=

src/Algebra/ScalarMult.v

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia Crypto.Util.ZUtil.Peano.
2-
Require Import Coq.Classes.Morphisms.
1+
From Coq Require Import ZArith Lia.
2+
Require Import Crypto.Util.ZUtil.Peano.
3+
From Coq Require Import Morphisms.
34
Require Import Crypto.Util.Tactics.BreakMatch.
45
Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Group.
56
Local Open Scope Z_scope.

src/Algebra/SubsetoidRing.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
Require Coq.setoid_ring.Ncring.
2-
Require Coq.setoid_ring.Cring.
3-
Require Import Coq.Classes.Morphisms.
1+
From Coq Require Ncring.
2+
From Coq Require Cring.
3+
From Coq Require Import Morphisms.
44
Require Import Crypto.Util.Tactics.BreakMatch.
55
Require Import Crypto.Util.Tactics.OnSubterms.
66
Require Import Crypto.Util.Tactics.Revert.
77
Require Import Crypto.Util.Tactics.RewriteHyp.
88
Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.Group Crypto.Algebra.Monoid.
99
Require Import Crypto.Algebra.Ring.
1010
Require Import Crypto.Util.Tactics.DestructHead.
11-
Require Coq.ZArith.ZArith Coq.PArith.PArith.
11+
From Coq Require ZArith PArith.
1212

1313

1414
Section Ring.

src/Arithmetic/BYInv.v

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Require Import Coq.Bool.Bool.
2-
Require Import Coq.ZArith.ZArith.
3-
Require Import Coq.Lists.List.
4-
Require Import Coq.nsatz.Nsatz.
5-
Require Import Coq.micromega.Lia.
1+
From Coq Require Import Bool.
2+
From Coq Require Import ZArith.
3+
From Coq Require Import List.
4+
From Coq Require Import Nsatz.
5+
From Coq Require Import Lia.
66
Require Import Crypto.Arithmetic.UniformWeight.
77
Require Import Crypto.Arithmetic.Saturated.
88
Require Import Crypto.Arithmetic.Core.

src/Arithmetic/BarrettReduction.v

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia Crypto.Algebra.Nsatz.
2-
Require Import Coq.derive.Derive.
3-
Require Import Coq.Lists.List.
1+
From Coq Require Import ZArith Lia.
2+
Require Import Crypto.Algebra.Nsatz.
3+
From Coq Require Import Derive.
4+
From Coq Require Import List.
45
Require Import Crypto.Algebra.Ring.
56
Require Import Crypto.Arithmetic.BaseConversion.
67
Require Import Crypto.Arithmetic.Core.

src/Arithmetic/BarrettReduction/Generalized.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
± 1] to [k ± offset]). This leads to weaker conditions on the
99
base ([b]), exponent ([k]), and the [offset] than those given in
1010
the HAC. *)
11-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
11+
From Coq Require Import ZArith Lia.
1212
Require Import Crypto.Util.ZUtil.Div.
1313
Require Import Crypto.Util.ZUtil.Modulo.
1414
Require Import Crypto.Util.ZUtil.Pow.

src/Arithmetic/BarrettReduction/HAC.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
does reduction modulo [b^(k+offset)] early (ensuring that we don't
99
have to carry around extra precision), but requires more stringint
1010
conditions on the base ([b]), exponent ([k]), and the [offset]. *)
11-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
11+
From Coq Require Import ZArith Lia.
1212
Require Import Crypto.Util.Tactics.BreakMatch.
1313
Require Import Crypto.Util.ZUtil.Tactics.LtbToLt.
1414
Require Import Crypto.Util.ZUtil.Tactics.ZeroBounds.

src/Arithmetic/BarrettReduction/RidiculousFish.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Require Import Crypto.Util.Notations.
22
Require Import Crypto.Util.ZUtil.Hints.ZArith.
33
Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem.
4-
Require Import Coq.ZArith.ZArith.
5-
Require Import Coq.micromega.Lia.
4+
From Coq Require Import ZArith.
5+
From Coq Require Import Lia.
66

77
Open Scope Z_scope.
88

src/Arithmetic/BarrettReduction/Wikipedia.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(*** Barrett Reduction *)
22
(** This file implements Barrett Reduction on [Z]. We follow Wikipedia. *)
3-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
3+
From Coq Require Import ZArith Lia.
44
Require Import Crypto.Util.ZUtil.Tactics.ZeroBounds.
55
Require Import Crypto.Util.ZUtil.Tactics.SimplifyFractionsLe.
66
Require Import Crypto.Util.ZUtil.Tactics.LtbToLt.

src/Arithmetic/BaseConversion.v

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Require Import Coq.ZArith.ZArith.
2-
Require Import Coq.derive.Derive.
3-
Require Import Coq.Lists.List.
1+
From Coq Require Import ZArith.
2+
From Coq Require Import Derive.
3+
From Coq Require Import List.
44
Require Import Crypto.Arithmetic.Core.
55
Require Import Crypto.Arithmetic.ModOps.
66
Require Import Crypto.Arithmetic.Partition.

src/Arithmetic/BinaryExtendedGCD.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Require Import Coq.Bool.Bool.
2-
Require Import Coq.micromega.Lia.
3-
Require Import Coq.ZArith.ZArith.
4-
Require Import Coq.ZArith.Znumtheory.
1+
From Coq Require Import Bool.
2+
From Coq Require Import Lia.
3+
From Coq Require Import ZArith.
4+
From Coq Require Import Znumtheory.
55
Require Import Crypto.Util.Loops.
66
Require Import Crypto.Util.Tactics.DestructHead.
77
Require Import Crypto.Util.ZUtil.

src/Arithmetic/Core.v

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(* Following http://adam.chlipala.net/theses/andreser.pdf chapter 3 *)
2-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
3-
Require Import Coq.Structures.Orders.
4-
Require Import Coq.Lists.List.
2+
From Coq Require Import ZArith Lia.
3+
From Coq Require Import Orders.
4+
From Coq Require Import List.
55
Require Import Crypto.Algebra.Nsatz.
66
Require Import Crypto.Arithmetic.ModularArithmeticTheorems.
77
Require Import Crypto.Util.Decidable.

src/Arithmetic/DettmanMultiplication.v

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Require Import Crypto.Arithmetic.Core.
2-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
3-
Require Import Coq.Lists.List.
2+
From Coq Require Import ZArith Lia.
3+
From Coq Require Import List.
44
Require Import Crypto.Arithmetic.ModOps.
5-
Require Import Coq.QArith.QArith_base Coq.QArith.Qround.
5+
From Coq Require Import QArith_base Qround.
66
Local Open Scope list_scope.
77

88
Import Associational Positional.

src/Arithmetic/FLia.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Require Import ZArith.ZArith.
2-
Require Import Coq.micromega.Lia.
1+
Require Import PArith BinInt ZArith.
2+
From Coq Require Import Lia.
33
Require Import Crypto.Arithmetic.PrimeFieldTheorems.
44

55
Local Open Scope Z_scope.

src/Arithmetic/FancyMontgomeryReduction.v

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia Crypto.Algebra.Nsatz.
2-
Require Import Coq.derive.Derive.
3-
Require Import Coq.Lists.List.
1+
From Coq Require Import ZArith Lia.
2+
Require Import Crypto.Algebra.Nsatz.
3+
From Coq Require Import Derive.
4+
From Coq Require Import List.
45
Require Import Crypto.Arithmetic.BaseConversion.
56
Require Import Crypto.Arithmetic.Core.
67
Require Import Crypto.Arithmetic.ModOps.

src/Arithmetic/Freeze.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
2-
Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil.
1+
From Coq Require Import ZArith Lia.
2+
Require Import QArith_base Qround Crypto.Util.QUtil.
33
Require Import Crypto.Arithmetic.BaseConversion.
44
Require Import Crypto.Arithmetic.Core.
55
Require Import Crypto.Arithmetic.ModOps.

src/Arithmetic/ModOps.v

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia.
2-
Require Import Coq.derive.Derive.
3-
Require Import QArith.QArith_base QArith.Qround Crypto.Util.QUtil.
1+
From Coq Require Import ZArith Lia.
2+
From Coq Require Import Derive.
3+
Require Import QArith_base Qround Crypto.Util.QUtil.
44
Require Import Crypto.Arithmetic.Core.
55
Require Import Crypto.Util.ListUtil.
66
Require Import Crypto.Util.ZUtil.Tactics.DivModToQuotRem.

src/Arithmetic/ModularArithmeticPre.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Require Import Coq.ZArith.ZArith Coq.NArith.NArith Coq.Numbers.BinNums Coq.ZArith.Znumtheory.
2-
Require Import Coq.Logic.Eqdep_dec.
3-
Require Import Coq.Logic.EqdepFacts.
4-
Require Import Coq.micromega.Lia.
1+
From Coq Require Import ZArith NArith BinNums Znumtheory.
2+
From Coq Require Import Eqdep_dec.
3+
From Coq Require Import EqdepFacts.
4+
From Coq Require Import Lia.
55
Require Import Crypto.Util.NumTheoryUtil.
66
Require Export Crypto.Util.FixCoqMistakes.
77
Require Import Crypto.Util.Tactics.BreakMatch.

src/Arithmetic/ModularArithmeticTheorems.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Require Import Coq.micromega.Lia.
1+
From Coq Require Import Lia.
22
Require Import Crypto.Spec.ModularArithmetic.
33
Require Import Crypto.Arithmetic.ModularArithmeticPre.
44

5-
Require Import Coq.ZArith.ZArith Coq.ZArith.Zdiv Coq.ZArith.Znumtheory Coq.NArith.NArith. (* import Zdiv before Znumtheory *)
6-
Require Import Coq.Classes.Morphisms Coq.Setoids.Setoid.
7-
Require Export Coq.setoid_ring.Ring_theory Coq.setoid_ring.Ring_tac.
5+
From Coq Require Import ZArith Zdiv Znumtheory NArith NArithRing. (* import Zdiv before Znumtheory *)
6+
From Coq Require Import Morphisms Setoid.
7+
From Coq Require Export Ring_theory Ring_tac.
88

99
Require Import Crypto.Algebra.Hierarchy Crypto.Algebra.ScalarMult.
1010
Require Crypto.Algebra.Ring Crypto.Algebra.Field.

src/Arithmetic/MontgomeryReduction/Definition.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(*** Montgomery Multiplication *)
22
(** This file implements Montgomery Form, Montgomery Reduction, and
33
Montgomery Multiplication on [Z]. We follow Wikipedia. *)
4-
Require Import Coq.ZArith.ZArith.
4+
From Coq Require Import ZArith.
55
Require Import Crypto.Util.ZUtil.EquivModulo.
66
Require Import Crypto.Util.Notations.
77

src/Arithmetic/MontgomeryReduction/Proofs.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(** This file implements the proofs for Montgomery Form, Montgomery
33
Reduction, and Montgomery Multiplication on [Z]. We follow
44
Wikipedia. *)
5-
Require Import Coq.ZArith.ZArith Coq.micromega.Lia Coq.Structures.Equalities.
5+
From Coq Require Import ZArith Lia Equalities.
66
Require Import Crypto.Arithmetic.MontgomeryReduction.Definition.
77
Require Import Crypto.Util.ZUtil.EquivModulo.
88
Require Import Crypto.Util.ZUtil.Tactics.PullPush.Modulo.

src/Arithmetic/Partition.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Require Import Coq.micromega.Lia.
2-
Require Import Coq.ZArith.ZArith.
3-
Require Import Coq.Lists.List.
4-
Require Import Coq.Structures.Orders.
1+
From Coq Require Import Lia.
2+
From Coq Require Import ZArith.
3+
From Coq Require Import List.
4+
From Coq Require Import Orders.
55
Require Import Crypto.Arithmetic.Core.
66
Require Import Crypto.Util.ListUtil.
77
Require Import Crypto.Util.ZUtil.EquivModulo.

0 commit comments

Comments
 (0)