Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Iris
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Roux
Iris
Commits
f4b812a5
Verified
Commit
f4b812a5
authored
3 years ago
by
Tej Chajed
Browse files
Options
Downloads
Patches
Plain Diff
Avoid using Min and Max, deprecated in v8.16
parent
fb7fea27
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
iris/algebra/numbers.v
+3
-3
3 additions, 3 deletions
iris/algebra/numbers.v
with
3 additions
and
3 deletions
iris/algebra/numbers.v
+
3
−
3
View file @
f4b812a5
...
@@ -69,7 +69,7 @@ Section max_nat.
...
@@ -69,7 +69,7 @@ Section max_nat.
apply
ra_total_mixin
;
apply
_
||
eauto
.
apply
ra_total_mixin
;
apply
_
||
eauto
.
-
intros
[
x
]
[
y
]
[
z
]
.
repeat
rewrite
max_nat_op
.
by
rewrite
Nat
.
max_assoc
.
-
intros
[
x
]
[
y
]
[
z
]
.
repeat
rewrite
max_nat_op
.
by
rewrite
Nat
.
max_assoc
.
-
intros
[
x
]
[
y
]
.
by
rewrite
max_nat_op
Nat
.
max_comm
.
-
intros
[
x
]
[
y
]
.
by
rewrite
max_nat_op
Nat
.
max_comm
.
-
intros
[
x
]
.
by
rewrite
max_nat_op
Max
.
max_id
empotent
.
-
intros
[
x
]
.
by
rewrite
max_nat_op
Nat
.
max_id
.
Qed
.
Qed
.
Canonical
Structure
max_natR
:
cmra
:=
discreteR
max_nat
max_nat_ra_mixin
.
Canonical
Structure
max_natR
:
cmra
:=
discreteR
max_nat
max_nat_ra_mixin
.
...
@@ -124,7 +124,7 @@ Section min_nat.
...
@@ -124,7 +124,7 @@ Section min_nat.
apply
ra_total_mixin
;
apply
_
||
eauto
.
apply
ra_total_mixin
;
apply
_
||
eauto
.
-
intros
[
x
]
[
y
]
[
z
]
.
repeat
rewrite
min_nat_op_min
.
by
rewrite
Nat
.
min_assoc
.
-
intros
[
x
]
[
y
]
[
z
]
.
repeat
rewrite
min_nat_op_min
.
by
rewrite
Nat
.
min_assoc
.
-
intros
[
x
]
[
y
]
.
by
rewrite
min_nat_op_min
Nat
.
min_comm
.
-
intros
[
x
]
[
y
]
.
by
rewrite
min_nat_op_min
Nat
.
min_comm
.
-
intros
[
x
]
.
by
rewrite
min_nat_op_min
Min
.
min_id
empotent
.
-
intros
[
x
]
.
by
rewrite
min_nat_op_min
Nat
.
min_id
.
Qed
.
Qed
.
Canonical
Structure
min_natR
:
cmra
:=
discreteR
min_nat
min_nat_ra_mixin
.
Canonical
Structure
min_natR
:
cmra
:=
discreteR
min_nat
min_nat_ra_mixin
.
...
@@ -147,7 +147,7 @@ Section min_nat.
...
@@ -147,7 +147,7 @@ Section min_nat.
Proof
.
done
.
Qed
.
Proof
.
done
.
Qed
.
Global
Instance
:
RightAbsorb
(
=
)
(
MinNat
0
)
(
⋅
)
.
Global
Instance
:
RightAbsorb
(
=
)
(
MinNat
0
)
(
⋅
)
.
Proof
.
intros
[
x
]
.
by
rewrite
min_nat_op_min
Min
.
min_0_r
.
Qed
.
Proof
.
intros
[
x
]
.
by
rewrite
min_nat_op_min
Nat
.
min_0_r
.
Qed
.
Global
Instance
:
IdemP
(
=@
{
min_nat
})
(
⋅
)
.
Global
Instance
:
IdemP
(
=@
{
min_nat
})
(
⋅
)
.
Proof
.
intros
[
x
]
.
rewrite
min_nat_op_min
.
apply
f_equal
.
lia
.
Qed
.
Proof
.
intros
[
x
]
.
rewrite
min_nat_op_min
.
apply
f_equal
.
lia
.
Qed
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment