Skip to content

Commit 00a69ca

Browse files
committed
---
yaml --- r: 179439 b: refs/heads/snap-stage3 c: fb6b970 h: refs/heads/master i: 179437: 8b538ed 179435: b5abd52 179431: 80cbe2a 179423: bc39c09 v: v3
1 parent 8efa439 commit 00a69ca

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 0ba9e1fa52627404a1e5b90f745f96a872a0c564
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 3ac862816fc57fb6047986624d98f986cbfd40b9
4+
refs/heads/snap-stage3: fb6b970bf8d12182a69b1e7ae222f3e2ebbb9003
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libstd/io/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use error::Error as StdError;
2424
use fmt;
2525
use iter::Iterator;
2626
use marker::Sized;
27-
use mem;
2827
use ops::{Drop, FnOnce};
2928
use option::Option::{self, Some, None};
3029
use ptr::PtrExt;
@@ -69,8 +68,8 @@ fn with_end_to_cap<F>(v: &mut Vec<u8>, f: F) -> Result<usize>
6968
unsafe {
7069
let n = try!(f({
7170
let base = v.as_mut_ptr().offset(v.len() as isize);
72-
black_box(slice::from_raw_mut_buf(mem::copy_lifetime(v, &base),
73-
v.capacity() - v.len()))
71+
black_box(slice::from_raw_parts_mut(base,
72+
v.capacity() - v.len()))
7473
}));
7574

7675
// If the closure (typically a `read` implementation) reported that it

0 commit comments

Comments
 (0)