collections: remove List

It was decided in a meeting that this module wasn't needed,
and more thought should be put into a persistent collections
library.

src/libarena/lib.rs

@@ -27,8 +27,6 @@
 
 extern crate collections;
 
-use collections::list::{List, Cons, Nil};
-
 use std::cast::{transmute, transmute_mut, transmute_mut_region};
 use std::cast;
 use std::cell::{Cell, RefCell};
@@ -87,7 +85,7 @@ pub struct Arena {
     // access the head.
     priv head: Chunk,
     priv copy_head: Chunk,
-    priv chunks: RefCell<@List<Chunk>>,
+    priv chunks: RefCell<Vec<Chunk>>,
 }
 
 impl Arena {
@@ -99,7 +97,7 @@ impl Arena {
         Arena {
             head: chunk(initial_size, false),
             copy_head: chunk(initial_size, true),
-            chunks: RefCell::new(@Nil),
+            chunks: RefCell::new(Vec::new()),
         }
     }
 }
@@ -117,7 +115,7 @@ impl Drop for Arena {
     fn drop(&mut self) {
         unsafe {
             destroy_chunk(&self.head);
-            for chunk in self.chunks.get().iter() {
+            for chunk in self.chunks.borrow().iter() {
                 if !chunk.is_copy.get() {
                     destroy_chunk(chunk);
                 }
@@ -179,7 +177,7 @@ impl Arena {
     fn alloc_copy_grow(&mut self, n_bytes: uint, align: uint) -> *u8 {
         // Allocate a new chunk.
         let new_min_chunk_size = cmp::max(n_bytes, self.chunk_size());
-        self.chunks.set(@Cons(self.copy_head.clone(), self.chunks.get()));
+        self.chunks.borrow_mut().push(self.copy_head.clone());
         self.copy_head =
             chunk(num::next_power_of_two(new_min_chunk_size + 1u), true);
 
@@ -219,7 +217,7 @@ impl Arena {
                          -> (*u8, *u8) {
         // Allocate a new chunk.
         let new_min_chunk_size = cmp::max(n_bytes, self.chunk_size());
-        self.chunks.set(@Cons(self.head.clone(), self.chunks.get()));
+        self.chunks.borrow_mut().push(self.head.clone());
         self.head =
             chunk(num::next_power_of_two(new_min_chunk_size + 1u), false);
 

src/libcollections/lib.rs

@@ -33,7 +33,6 @@ pub use deque::Deque;
 pub use dlist::DList;
 pub use enum_set::EnumSet;
 pub use hashmap::{HashMap, HashSet};
-pub use list::List;
 pub use lru_cache::LruCache;
 pub use priority_queue::PriorityQueue;
 pub use ringbuf::RingBuf;
@@ -47,7 +46,6 @@ pub mod deque;
 pub mod dlist;
 pub mod enum_set;
 pub mod hashmap;
-pub mod list;
 pub mod lru_cache;
 pub mod priority_queue;
 pub mod ringbuf;

src/librustc/middle/typeck/mod.rs

@@ -72,7 +72,6 @@ use util::nodemap::{DefIdMap, FnvHashMap};
 
 use std::cell::RefCell;
 use std::rc::Rc;
-use collections::List;
 use syntax::codemap::Span;
 use syntax::print::pprust::*;
 use syntax::{ast, ast_map, abi};
@@ -327,7 +326,7 @@ pub fn require_same_types(tcx: &ty::ctxt,
 
 // a list of mapping from in-scope-region-names ("isr") to the
 // corresponding ty::Region
-pub type isr_alist = @List<(ty::BoundRegion, ty::Region)>;
+pub type isr_alist = @Vec<(ty::BoundRegion, ty::Region)>;
 
 trait get_region<'a, T:'static> {
     fn get(&'a self, br: ty::BoundRegion) -> ty::Region;

src/test/bench/task-perf-alloc-unwind.rs

@@ -13,12 +13,16 @@
 extern crate collections;
 extern crate time;
 
-use collections::list::{List, Cons, Nil};
 use time::precise_time_s;
 use std::os;
 use std::task;
 use std::vec;
 
+#[deriving(Clone)]
+enum List<T> {
+    Nil, Cons(T, @List<T>)
+}
+
 enum UniqueList {
     ULNil, ULCons(~UniqueList)
 }

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

@@ -10,9 +10,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate collections;
-use collections::list::List;
-
 #[deriving(Clone)]
 enum foo {
   a(uint),
@@ -24,9 +21,21 @@ 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 mut x = Some(a(22u));
+    let exp = ~"Some(a(22u))";
+    let act = format!("{:?}", x);
+    assert_eq!(act, exp);
+    check_log(exp, x);
+
+    x = Some(b(~"hi"));
+    let exp = ~"Some(b(~\"hi\"))";
+    let act = format!("{:?}", x);
+    assert_eq!(act, exp);
+    check_log(exp, x);
+
+    x = None;
+    let exp = ~"None";
     let act = format!("{:?}", x);
-    assert!(act == exp);
+    assert_eq!(act, exp);
     check_log(exp, x);
 }