Skip to content

Commit 9903afc

Browse files
authored
Merge pull request #125 from math-comp/cleanup-deprecation
Remove deprecation code introduced in multinomials 2.2.0 and replace `note` with `use`
2 parents 7d6def0 + 625c5a3 commit 9903afc

2 files changed

Lines changed: 5 additions & 15 deletions

File tree

src/monalg.v

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,6 @@ HB.structure Definition MMorphism (M : monomType) (S : pzSemiRingType) :=
166166

167167
Module MMorphismExports.
168168
Notation "{ 'mmorphism' M -> S }" := (@MMorphism.type M S) : type_scope.
169-
#[deprecated(since="multinomials 2.2.0", note="Use MMorphism.clone instead.")]
170-
Notation "[ 'mmorphism' 'of' f 'as' g ]" := (MMorphism.clone _ _ f g)
171-
(at level 0, only parsing) : form_scope.
172-
#[deprecated(since="multinomials 2.2.0", note="Use MMorphism.clone instead.")]
173-
Notation "[ 'mmorphism' 'of' f ]" := (MMorphism.clone _ _ f _)
174-
(at level 0, only parsing) : form_scope.
175169
End MMorphismExports.
176170
Export MMorphismExports.
177171

@@ -197,7 +191,7 @@ Record malg : predArgType := Malg { malg_val : {fsfun K -> G with 0} }.
197191

198192
Fact malg_key : unit. Proof. by []. Qed.
199193

200-
#[deprecated(since="multinomials 2.5.0", note="Use Malg instead")]
194+
#[deprecated(since="multinomials 2.5.0", use=Malg)]
201195
Definition malg_of_fsfun k := locked_with k Malg.
202196
#[warning="-deprecated-reference"]
203197
Canonical malg_unlockable k := [unlockable fun malg_of_fsfun k].
@@ -223,7 +217,7 @@ Context {K : choiceType} {G : nmodType}.
223217

224218
Definition mcoeff (x : K) (g : {malg G[K]}) : G := malg_val g x.
225219

226-
#[deprecated(since="multinomials 2.5.0", note="Use Malg instead")]
220+
#[deprecated(since="multinomials 2.5.0", use=Malg)]
227221
Definition mkmalg : {fsfun K -> G with 0} -> {malg G[K]} := @Malg K G.
228222

229223
Definition mkmalgU (k : K) (x : G) := [malg y in [fset k] => x].
@@ -1370,7 +1364,7 @@ Coercion cmonom_val : cmonom >-> fsfun.
13701364

13711365
Fact cmonom_key : unit. Proof. by []. Qed.
13721366

1373-
#[deprecated(since="multinomials 2.5.0", note="Use CMonom instead")]
1367+
#[deprecated(since="multinomials 2.5.0", use=CMonom)]
13741368
Definition cmonom_of_fsfun k := locked_with k CMonom.
13751369
#[warning="-deprecated-reference"]
13761370
Canonical cmonom_unlockable k := [unlockable fun cmonom_of_fsfun k].
@@ -1381,7 +1375,7 @@ Notation "{ 'cmonom' I }" := (cmonom I) : type_scope.
13811375
Notation "''X_{1..' n '}'" := (cmonom 'I_n) : type_scope.
13821376
Notation "{ 'mpoly' R [ n ] }" := {malg R['X_{1..n}]} : type_scope.
13831377

1384-
#[deprecated(since="multinomials 2.5.0", note="Use CMonom instead"),
1378+
#[deprecated(since="multinomials 2.5.0", use=CMonom),
13851379
warning="-deprecated-reference"]
13861380
Notation mkcmonom := (cmonom_of_fsfun cmonom_key).
13871381
Notation "[ 'cmonom' E | i 'in' P ]" :=

src/mpoly.v

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -959,10 +959,6 @@ HB.mixin Record isMeasure (n : nat) (mf : 'X_{1..n} -> nat) := {
959959
#[short(type="measure")]
960960
HB.structure Definition Measure (n : nat) := {mf of isMeasure n mf}.
961961

962-
#[deprecated(since="multinomials 2.2.0", note="Use Measure.clone instead.")]
963-
Notation "[ 'measure' 'of' f ]" := (Measure.clone _ f _)
964-
(at level 0, only parsing) : form_scope.
965-
966962
(* -------------------------------------------------------------------- *)
967963
#[hnf] HB.instance Definition _ n := isMeasure.Build n mdeg mdeg0 mdegD.
968964

@@ -1624,7 +1620,7 @@ Canonical mpolyX_unlockable m := [unlockable of (mpolyX m)].
16241620

16251621
End MPolyVar.
16261622

1627-
#[deprecated(since="multinomials 2.5.0", note="Use mnm1 instead.")]
1623+
#[deprecated(since="multinomials 2.5.0", use=mnm1)]
16281624
Notation mX := mnm1.
16291625

16301626
Notation "'X_[ R , m ]" := (@mpolyX _ R m).

0 commit comments

Comments
 (0)