---

yaml
---
r: 133709
b: refs/heads/try
c: af29337
h: refs/heads/master
i:
  133707: a4a6fb9
v: v3

Author: tbu-

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e784e16840e8a0c623cc6166de26da9334db3d6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 828e075abd8ee2f8c16f6cb1b93c0d99307e704d
-refs/heads/try: dbc3cb3a54c02211d8e4f9ff082c4ee2d544ec7d
+refs/heads/try: af293372e4ea9578840338bdd1b765bfc3c80352
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcollections/vec.rs

@@ -1710,9 +1710,6 @@ pub mod raw {
     }
 }
 
-// TODO: Find some way to statically assert that `T` and `U` have the same
-// size.
-//
 /// An owned, partially type-converted vector.
 ///
 /// No allocations are performed by usage, only a deallocation happens in the
@@ -1734,7 +1731,7 @@ pub mod raw {
 /// assert_eq!(pv.pop(), None);
 /// pv.push(2u);
 /// pv.push(3);
-/// assert_eq!(pv.unwrap(), vec![2, 3]);
+/// assert_eq!(pv.into_vec(), vec![2, 3]);
 /// ```
 //
 // Upheld invariants:
@@ -1767,7 +1764,7 @@ pub struct PartialVec<T,U> {
 impl<T,U> PartialVec<T,U> {
     /// Creates a `PartialVec` from a `Vec`.
     pub fn new(mut vec: Vec<T>) -> PartialVec<T,U> {
-        // TODO: do this statically
+        // FIXME: Assert that the types `T` and `U` have the same size.
         assert!(mem::size_of::<T>() != 0);
         assert!(mem::size_of::<U>() != 0);
         assert!(mem::size_of::<T>() == mem::size_of::<U>());
@@ -1872,7 +1869,7 @@ impl<T,U> PartialVec<T,U> {
     ///
     /// Fails if not all `T`s were popped, also fails if not the same amount of
     /// `U`s was pushed before calling `unwrap`.
-    pub fn unwrap(self) -> Vec<U> {
+    pub fn into_vec(self) -> Vec<U> {
         // If `self.end_u == self.end_t`, we know from (e) that there are no
         // more `T`s in `vec`, we also know that the whole length of `vec` is
         // now used by `U`s, thus we can just transmute `vec` from a vector of
@@ -1945,11 +1942,10 @@ impl<T> Vec<T> {
     pub fn map_inplace<U>(self, f: |T| -> U) -> Vec<U> {
         let mut pv = PartialVec::new(self);
         loop {
-            // TODO: need this extra assignment for borrowck to pass
             let maybe_t = pv.pop();
             match maybe_t {
                 Some(t) => pv.push(f(t)),
-                None => return pv.unwrap(),
+                None => return pv.into_vec(),
             };
         }
     }