rollup merge of #19832: japaric/no-nocopy

r? @aturon / @alexcrichton
2014-12-17 08:34:09 -08:00
parent bdb1146181 c3778fae6f
commit dbd68c70cd
11 changed files with 19 additions and 48 deletions
--- a/src/libcore/slice.rs
+++ b/src/libcore/slice.rs
@@ -292,13 +292,11 @@ impl<T> SliceExt<T> for [T] {
            if mem::size_of::<T>() == 0 {
                MutItems{ptr: p,
                         end: (p as uint + self.len()) as *mut T,
-                         marker: marker::ContravariantLifetime::<'a>,
-                         marker2: marker::NoCopy}
+                         marker: marker::ContravariantLifetime::<'a>}
            } else {
                MutItems{ptr: p,
                         end: p.offset(self.len() as int),
-                         marker: marker::ContravariantLifetime::<'a>,
-                         marker2: marker::NoCopy}
+                         marker: marker::ContravariantLifetime::<'a>}
            }
        }
    }
@@ -818,7 +816,6 @@ pub struct MutItems<'a, T: 'a> {
    ptr: *mut T,
    end: *mut T,
    marker: marker::ContravariantLifetime<'a>,
-    marker2: marker::NoCopy
 }

 #[experimental]