Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lambda-rust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Simon Spies
lambda-rust
Commits
9cb0a686
Commit
9cb0a686
authored
4 years ago
by
Robbert Krebbers
Browse files
Options
Downloads
Patches
Plain Diff
Forwards compatibility fixes with iris!516.
parent
6e98f818
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
theories/lifetime/model/borrow_sep.v
+3
-3
3 additions, 3 deletions
theories/lifetime/model/borrow_sep.v
theories/lifetime/model/faking.v
+4
-4
4 additions, 4 deletions
theories/lifetime/model/faking.v
with
7 additions
and
7 deletions
theories/lifetime/model/borrow_sep.v
+
3
−
3
View file @
9cb0a686
...
...
@@ -97,9 +97,9 @@ Proof.
iDestruct
(
own_bor_valid_2
with
"Hown Hbor2"
)
as
%
[
EQB2
%
to_borUR_included
_]
%
auth_both_valid
.
iAssert
⌜
j1
≠
j2
⌝%
I
with
"[#]"
as
%
Hj1j2
.
{
iDestruct
(
own_bor_valid_2
with
"Hbor1 Hbor2"
)
as
%
Hj1j2
%
auth_valid_discrete
.
iIntros
(
->
)
.
exfalso
.
revert
Hj1j2
.
rewrite
/=
singleton_op
singleton_valid
.
{
iIntros
(
->
)
.
iDestruct
(
own_bor_valid_2
with
"Hbor1 Hbor2"
)
as
%
Hj1j2
.
exfalso
;
revert
Hj1j2
.
rewrite
-
auth_frag_op
auth_frag_valid
singleton_op
singleton_valid
.
by
intros
[[]]
.
}
iMod
(
slice_combine
_
_
true
with
"Hslice1 Hslice2 Hbox"
)
as
(
γ
)
"(% & Hslice & Hbox)"
;
first
solve_ndisj
.
...
...
This diff is collapsed.
Click to expand it.
theories/lifetime/model/faking.v
+
4
−
4
View file @
9cb0a686
...
...
@@ -17,10 +17,10 @@ Proof.
destruct
(
decide
(
is_Some
(
I
!!
κ
)))
as
[?|
HIκ
%
eq_None_not_Some
]
.
{
iModIntro
.
iExists
A
,
I
.
by
iFrame
.
}
iMod
(
own_alloc
(
●
0
⋅
◯
0
))
as
(
γcnt
)
"[Hcnt Hcnt']"
;
first
by
apply
auth_both_valid
.
iMod
(
own_alloc
(
(
●
∅
⋅
◯
∅
)
:
auth
(
gmap
slice_name
(
frac
*
agree
bor_stateO
))))
as
(
γbor
)
"[Hbor Hbor']"
;
first
by
apply
auth_both_valid
.
iMod
(
own_alloc
(
(
●
ε
)
:
auth
(
gset_disj
slice_name
)))
iMod
(
own_alloc
(
●
(
∅
:
gmap
slice_name
(
frac
*
agree
bor_stateO
))
⋅
◯
∅
))
as
(
γbor
)
"[Hbor Hbor']"
.
{
by
apply
auth_both_valid
.
}
iMod
(
own_alloc
(
●
(
ε
:
gset_disj
slice_name
)))
as
(
γinh
)
"Hinh"
;
first
by
apply
auth_auth_valid
.
set
(
γs
:=
LftNames
γbor
γcnt
γinh
)
.
iMod
(
own_update
with
"HI"
)
as
"[HI Hγs]"
.
...
...
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