diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2013-07-08 11:05:52 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2013-07-08 13:55:11 -0400 |
| commit | 0c6d02f391aa668b2ead91e8a4ed545475ac2c90 (patch) | |
| tree | 89744dbdb6a4ea49960f3f69ed3a8580fc8979ec /src/libstd | |
| parent | b5fc4ae9189f8ffe52fd6ec7b228d803f594b48b (diff) | |
| download | rust-0c6d02f391aa668b2ead91e8a4ed545475ac2c90.tar.gz rust-0c6d02f391aa668b2ead91e8a4ed545475ac2c90.zip | |
Correct merge errors
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/vec.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index c546be63138..a69ffca026b 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -1277,7 +1277,7 @@ impl<T> OwnedVector<T> for ~[T] { let valptr = ptr::to_mut_unsafe_ptr(&mut self[ln - 1u]); unsafe { raw::set_len(self, ln - 1u); - ptr::read_ptr(valptr) + Some(ptr::read_ptr(valptr)) } } } |