Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glen Mével
Iris
Commits
f6beee55
Commit
f6beee55
authored
Dec 30, 2021
by
Ralf Jung
Browse files
Merge branch 'master' into 'master'
Fix name, `Later_inj` -> `Next_inj`. See merge request
iris/iris!770
parents
ec0acc9c
46595d5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
f6beee55
...
...
@@ -19,6 +19,7 @@ lemma.
*
Equip
`frac_agree`
with support for
`dfrac`
and rename it to
`dfrac_agree`
.
The old
`to_frac_agree`
and its lemmas still exist, except that the
`frac_agree_op_valid`
lemmas are made bi-directional.
*
Rename typeclass instance
`Later_inj`
->
`Next_inj`
.
**Changes in `bi`:**
...
...
iris/algebra/ofe.v
View file @
f6beee55
...
...
@@ -1170,7 +1170,7 @@ Section later.
Global
Instance
Next_contractive
:
Contractive
(@
Next
A
).
Proof
.
by
intros
[|
n
]
x
y
.
Qed
.
Global
Instance
Later
_inj
n
:
Inj
(
dist
n
)
(
dist
(
S
n
))
(@
Next
A
).
Global
Instance
Next
_inj
n
:
Inj
(
dist
n
)
(
dist
(
S
n
))
(@
Next
A
).
Proof
.
by
intros
x
y
.
Qed
.
Lemma
Next_uninj
x
:
∃
a
,
x
≡
Next
a
.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment