---

yaml
---
r: 149612
b: refs/heads/try2
c: 2b36276
h: refs/heads/master
v: v3

Author: brunoabinader

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 8846970bba8d529f4361eec65d39254060483e03
+refs/heads/try2: 2b362768ff3cab2c966f1f18cf119b21fc96ea30
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcollections/list.rs

@@ -17,11 +17,6 @@ pub enum List<T> {
     Nil,
 }
 
-/// Create a list from a vector
-pub fn from_vec<T:Clone + 'static>(v: &[T]) -> @List<T> {
-    v.rev_iter().fold(@Nil::<T>, |t, h| @Cons((*h).clone(), t))
-}
-
 /**
  * Left fold
  *
@@ -133,6 +128,16 @@ pub fn append<T:Clone + 'static>(list: @List<T>, other: @List<T>) -> @List<T> {
     }
 }
 
+impl<T:'static + Clone> List<T> {
+    /// Create a list from a vector
+    pub fn from_vec(v: &[T]) -> List<T> {
+        match v.len() {
+            0 => Nil,
+            _ => v.rev_iter().fold(Nil, |tail, value: &T| Cons(value.clone(), @tail))
+        }
+    }
+}
+
 /*
 /// Push one element into the front of a list, returning a new list
 /// THIS VERSION DOESN'T ACTUALLY WORK
@@ -171,16 +176,16 @@ pub fn each<T>(list: @List<T>, f: |&T| -> bool) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use list::{List, Nil, from_vec, head, is_empty, tail};
+    use list::{List, Nil, head, is_empty, tail};
     use list;
 
     use std::option;
 
     #[test]
     fn test_is_empty() {
-        let empty : @list::List<int> = from_vec([]);
-        let full1 = from_vec([1]);
-        let full2 = from_vec(['r', 'u']);
+        let empty : @list::List<int> = @List::from_vec([]);
+        let full1 = @List::from_vec([1]);
+        let full2 = @List::from_vec(['r', 'u']);
 
         assert!(is_empty(empty));
         assert!(!is_empty(full1));
@@ -189,7 +194,7 @@ mod tests {
 
     #[test]
     fn test_from_vec() {
-        let list = from_vec([0, 1, 2]);
+        let list = @List::from_vec([0, 1, 2]);
 
         assert_eq!(head(list), 0);
 
@@ -202,14 +207,14 @@ mod tests {
 
     #[test]
     fn test_from_vec_empty() {
-        let empty : @list::List<int> = from_vec([]);
-        assert_eq!(empty, @list::Nil::<int>);
+        let empty : list::List<int> = List::from_vec([]);
+        assert_eq!(empty, Nil::<int>);
     }
 
     #[test]
     fn test_foldl() {
         fn add(a: &uint, b: &int) -> uint { return *a + (*b as uint); }
-        let list = from_vec([0, 1, 2, 3, 4]);
+        let list = @List::from_vec([0, 1, 2, 3, 4]);
         let empty = @list::Nil::<int>;
         assert_eq!(list::foldl(0u, list, add), 10u);
         assert_eq!(list::foldl(0u, empty, add), 0u);
@@ -220,21 +225,21 @@ mod tests {
         fn sub(a: &int, b: &int) -> int {
             *a - *b
         }
-        let list = from_vec([1, 2, 3, 4]);
+        let list = @List::from_vec([1, 2, 3, 4]);
         assert_eq!(list::foldl(0, list, sub), -10);
     }
 
     #[test]
     fn test_find_success() {
         fn match_(i: &int) -> bool { return *i == 2; }
-        let list = from_vec([0, 1, 2]);
+        let list = @List::from_vec([0, 1, 2]);
         assert_eq!(list::find(list, match_), option::Some(2));
     }
 
     #[test]
     fn test_find_fail() {
         fn match_(_i: &int) -> bool { return false; }
-        let list = from_vec([0, 1, 2]);
+        let list = @List::from_vec([0, 1, 2]);
         let empty = @list::Nil::<int>;
         assert_eq!(list::find(list, match_), option::None::<int>);
         assert_eq!(list::find(empty, match_), option::None::<int>);
@@ -243,15 +248,15 @@ mod tests {
     #[test]
     fn test_any() {
         fn match_(i: &int) -> bool { return *i == 2; }
-        let list = from_vec([0, 1, 2]);
+        let list = @List::from_vec([0, 1, 2]);
         let empty = @list::Nil::<int>;
         assert_eq!(list::any(list, match_), true);
         assert_eq!(list::any(empty, match_), false);
     }
 
     #[test]
     fn test_has() {
-        let list = from_vec([5, 8, 6]);
+        let list = @List::from_vec([5, 8, 6]);
         let empty = @list::Nil::<int>;
         assert!((list::has(list, 5)));
         assert!((!list::has(list, 7)));
@@ -261,15 +266,15 @@ mod tests {
 
     #[test]
     fn test_len() {
-        let list = from_vec([0, 1, 2]);
+        let list = @List::from_vec([0, 1, 2]);
         let empty = @list::Nil::<int>;
         assert_eq!(list::len(list), 3u);
         assert_eq!(list::len(empty), 0u);
     }
 
     #[test]
     fn test_append() {
-        assert!(from_vec([1,2,3,4])
-            == list::append(list::from_vec([1,2]), list::from_vec([3,4])));
+        assert!(@List::from_vec([1,2,3,4])
+            == list::append(@List::from_vec([1,2]), @List::from_vec([3,4])));
     }
 }

branches/try2/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs

@@ -11,7 +11,7 @@
 // except according to those terms.
 
 extern crate collections;
-use collections::list;
+use collections::list::List;
 
 #[deriving(Clone)]
 enum foo {
@@ -24,8 +24,8 @@ fn check_log<T>(exp: ~str, v: T) {
 }
 
 pub fn main() {
-    let x = list::from_vec([a(22u), b(~"hi")]);
-    let exp = ~"@Cons(a(22u), @Cons(b(~\"hi\"), @Nil))";
+    let x = List::from_vec([a(22u), b(~"hi")]);
+    let exp = ~"Cons(a(22u), @Cons(b(~\"hi\"), @Nil))";
     let act = format!("{:?}", x);
     assert!(act == exp);
     check_log(exp, x);