Skip to content
/ rust Public
forked from rust-lang/rust

Commit 31e9f7a

Browse files
committed
Auto merge of rust-lang#3016 - RalfJung:is_reserved, r=RalfJung
fix typo: is_reserved
2 parents 7ab10d2 + 84edcb9 commit 31e9f7a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/tools/miri/src/borrow_tracker/tree_borrows/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
283283
// interleaving, but wether UB happens can depend on whether a write occurs in the
284284
// future...
285285
let is_write = new_perm.initial_state.is_active()
286-
|| (new_perm.initial_state.is_resrved() && new_perm.protector.is_some());
286+
|| (new_perm.initial_state.is_reserved() && new_perm.protector.is_some());
287287
if is_write {
288288
// Need to get mutable access to alloc_extra.
289289
// (Cannot always do this as we can do read-only reborrowing on read-only allocations.)

src/tools/miri/src/borrow_tracker/tree_borrows/perms.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl Permission {
152152
matches!(self.inner, Active)
153153
}
154154

155-
pub fn is_resrved(self) -> bool {
155+
pub fn is_reserved(self) -> bool {
156156
matches!(self.inner, Reserved { .. })
157157
}
158158

0 commit comments

Comments
 (0)