Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

references to open_atomic_invariant! should refer vstd, not the client crate #970

Merged
merged 1 commit into from
Feb 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions source/pervasive/atomic_ghost.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ macro_rules! atomic_with_ghost_store {
($e:expr, $operand:expr, $prev:pat, $next:pat, $res:pat, $g:ident, $b:block) => {
::builtin_macros::verus_exec_expr!{ {
let atomic = &($e);
crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
$crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
#[allow(unused_mut)]
let tracked (mut perm, mut $g) = pair;
let ghost $prev = perm.view().value;
Expand All @@ -343,7 +343,7 @@ macro_rules! atomic_with_ghost_load {
::builtin_macros::verus_exec_expr!{ {
let result;
let atomic = &($e);
crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
$crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
#[allow(unused_mut)]
let tracked (perm, mut $g) = pair;
result = atomic.patomic.load(Tracked(&perm));
Expand All @@ -368,7 +368,7 @@ macro_rules! atomic_with_ghost_no_op {
($e:expr, $prev:pat, $next: pat, $res: pat, $g:ident, $b:block) => {
::builtin_macros::verus_exec_expr!{ {
let atomic = &($e);
crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
$crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
#[allow(unused_mut)]
let tracked (perm, mut $g) = pair;
let ghost $res = result;
Expand All @@ -393,7 +393,7 @@ macro_rules! atomic_with_ghost_update_with_1_operand {
let result;
let atomic = &($e);
let operand = $operand;
crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
$crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
#[allow(unused_mut)]
let tracked (mut perm, mut $g) = pair;
let ghost $prev = perm.view().value;
Expand Down Expand Up @@ -421,7 +421,7 @@ macro_rules! atomic_with_ghost_update_with_2_operand {
let atomic = &($e);
let operand1 = $operand1;
let operand2 = $operand2;
crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
$crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
#[allow(unused_mut)]
let tracked (mut perm, mut $g) = pair;
let ghost $prev = perm.view().value;
Expand All @@ -448,7 +448,7 @@ macro_rules! atomic_with_ghost_update_fetch_add {
let result;
let atomic = &($e);
let operand = $operand;
crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
$crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
#[allow(unused_mut)]
let tracked (mut perm, mut $g) = pair;

Expand Down Expand Up @@ -479,7 +479,7 @@ macro_rules! atomic_with_ghost_update_fetch_sub {
let result;
let atomic = &($e);
let operand = $operand;
crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
$crate::open_atomic_invariant!(atomic.atomic_inv.borrow() => pair => {
#[allow(unused_mut)]
let tracked (mut perm, mut $g) = pair;

Expand Down
Loading