user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #19832: japaric/no-nocopy

Browse source 
r? @aturon / @alexcrichton
This commit is contained in:
Alex Crichton 2014-12-17 08:34:09 -08:00
commit dbd68c70cd
11 changed files with 19 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc/util/snapshot_vec.rs
View file

@ -20,7 +20,6 @@
//! those changes.
use self::UndoLog::*;
use std::kinds::marker;
use std::mem;
#[deriving(PartialEq)]
@ -47,10 +46,9 @@ pub struct SnapshotVec<T,U,D> {
delegate: D
}
// Snapshots are tokens that should be created/consumed linearly.
#[allow(missing_copy_implementations)]
pub struct Snapshot {
// Snapshots are tokens that should be created/consumed linearly.
marker: marker::NoCopy,
// Length of the undo log at the time the snapshot was taken.
length: uint,
}
@ -112,8 +110,7 @@ impl<T,U,D:SnapshotVecDelegate<T,U>> SnapshotVec<T,U,D> {
pub fn start_snapshot(&mut self) -> Snapshot {
let length = self.undo_log.len();
self.undo_log.push(OpenSnapshot);
Snapshot { length: length,
marker: marker::NoCopy }
Snapshot { length: length }
}
fn assert_open_snapshot(&self, snapshot: &Snapshot) {