From 0c6d02f391aa668b2ead91e8a4ed545475ac2c90 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Mon, 8 Jul 2013 11:05:52 -0400
Subject: Correct merge errors

---
 src/libstd/vec.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd')

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))
                 }
             }
         }
-- 
cgit 1.4.1-3-g733a5