mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer drain over manual implementation of drain

Browse Source
This commit is contained in:
Oliver Scherer 2019-05-19 12:40:59 +02:00
parent 37b2eea714
commit 3fde45233b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stacked_borrows.rs
View File

@ -226,7 +226,7 @@ impl<'tcx> Stack {
) )
} }
/// Find the first write-incompatible item above the given one -- /// Find the first write-incompatible item above the given one --
/// i.e, find the height to which the stack will be truncated when writing to `granting`. /// i.e, find the height to which the stack will be truncated when writing to `granting`.
fn find_first_write_incompaible(&self, granting: usize) -> usize { fn find_first_write_incompaible(&self, granting: usize) -> usize {
let perm = self.borrows[granting].perm; let perm = self.borrows[granting].perm;
@ -297,8 +297,7 @@ impl<'tcx> Stack {
// Remove everything above the write-compatible items, like a proper stack. This makes sure read-only and unique // Remove everything above the write-compatible items, like a proper stack. This makes sure read-only and unique
// pointers become invalid on write accesses (ensures F2a, and ensures U2 for write accesses). // pointers become invalid on write accesses (ensures F2a, and ensures U2 for write accesses).
let first_incompatible_idx = self.find_first_write_incompaible(granting_idx); let first_incompatible_idx = self.find_first_write_incompaible(granting_idx);
while self.borrows.len() > first_incompatible_idx { for item in self.borrows.drain(first_incompatible_idx..).rev() {
let item = self.borrows.pop().unwrap();
trace!("access: popping item {}", item); trace!("access: popping item {}", item);
Stack::check_protector(&item, Some(tag), global)?; Stack::check_protector(&item, Some(tag), global)?;
} }
@ -340,8 +339,7 @@ impl<'tcx> Stack {
)))?; )))?;
// Step 2: Remove all items. Also checks for protectors. // Step 2: Remove all items. Also checks for protectors.
while self.borrows.len() > 0 { for item in self.borrows.drain(..).rev() {
let item = self.borrows.pop().unwrap();
Stack::check_protector(&item, None, global)?; Stack::check_protector(&item, None, global)?;
} }