Address review of RcVec

diff --git a/src/libsyntax/util/rc_vec.rs b/src/libsyntax/util/rc_vec.rs
index b2785d7143d7d8773a57ec004acac671dfb3acbc..99fbce1ad91e1e27106e3a0590d7d9fee7b8d1b7 100644 (file)
--- a/src/libsyntax/util/rc_vec.rs
+++ b/src/libsyntax/util/rc_vec.rs
@@ -27,12 +27,7 @@ pub fn new(mut vec: Vec<T>) -> Self {
         // to hold the initial elements. Callers that anticipate needing to
         // extend the vector may prefer RcVec::new_preserving_capacity.
         vec.shrink_to_fit();
-
-        RcVec {
-            offset: 0,
-            len: vec.len() as u32,
-            data: Lrc::new(vec),
-        }
+        Self::new_preserving_capacity(vec)
     }
 
     pub fn new_preserving_capacity(vec: Vec<T>) -> Self {
@@ -59,10 +54,10 @@ pub fn try_unwrap(self) -> Result<Vec<T>, Self> {
             Ok(mut vec) => {
                 // Drop any elements after our view of the data.
                 vec.truncate(self.offset as usize + self.len as usize);
-                // Drop any elements before our view of the data.
-                if self.offset != 0 {
-                    vec.drain(..self.offset as usize);
-                }
+                // Drop any elements before our view of the data. Do this after
+                // the `truncate` so that elements past the end of our view do
+                // not need to be copied around.
+                vec.drain(..self.offset as usize);
                 Ok(vec)
             }