enumset fallout

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index d87fbb016208a5cf8734ddcdd33d5bed8baf565b..90e9973c3f302f9d8ae4c2882f7ea3a114ef9917 100644 (file)
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -36,6 +36,7 @@
 extern crate rustc_back;
 extern crate serialize;
 extern crate rbml;
+extern crate collections;
 #[phase(plugin, link)] extern crate log;
 #[phase(plugin, link)] extern crate syntax;
 

diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index b349b5ca0bf239ee8f2eb46a9f7a1104e17e778e..0ad07bed7d923869651d707349f557e18476bbcd 100644 (file)
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -77,7 +77,7 @@
 use std::mem;
 use std::ops;
 use std::rc::Rc;
-use std::collections::enum_set::{EnumSet, CLike};
+use collections::enum_set::{EnumSet, CLike};
 use std::collections::hash_map::{HashMap, Occupied, Vacant};
 use syntax::abi;
 use syntax::ast::{CrateNum, DefId, DUMMY_NODE_ID, Ident, ItemTrait, LOCAL_CRATE};

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 5a91298acdf255e5efd60b5c8a395066afc86cb7..3d51a6d6ab0772a40812af631645e6071b032481 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -472,7 +472,7 @@ fn json_output(krate: clean::Crate, res: Vec<plugins::PluginJson> ,
     //   "crate": { parsed crate ... },
     //   "plugins": { output of plugins ... }
     // }
-    let mut json = std::collections::TreeMap::new();
+    let mut json = std::collections::BTreeMap::new();
     json.insert("schema".to_string(), Json::String(SCHEMA_VERSION.to_string()));
     let plugins_json = res.into_iter()
                           .filter_map(|opt| {

diff --git a/src/libserialize/collection_impls.rs b/src/libserialize/collection_impls.rs
index 8fb025623d478276cf093940f67a1a3387fb1774..f2d79b133469958d48a5a3d8b3519871b5f494c0 100644 (file)
--- a/src/libserialize/collection_impls.rs
+++ b/src/libserialize/collection_impls.rs
@@ -15,9 +15,8 @@
 use std::hash::{Hash, Hasher};
 
 use {Decodable, Encodable, Decoder, Encoder};
-use std::collections::{DList, RingBuf, BTreeMap, BTreeSet, HashMap, HashSet,
-                       TrieMap, TrieSet, VecMap};
-use std::collections::enum_set::{EnumSet, CLike};
+use std::collections::{DList, RingBuf, BTreeMap, BTreeSet, HashMap, HashSet, VecMap};
+use collections::enum_set::{EnumSet, CLike};
 
 impl<
     E,
@@ -98,7 +97,7 @@ impl<
     K: Decodable<D, E> + PartialEq + Ord,
     V: Decodable<D, E> + PartialEq
 > Decodable<D, E> for BTreeMap<K, V> {
-    fn decode(d: &mut D) -> Result<TreeMap<K, V>, E> {
+    fn decode(d: &mut D) -> Result<BTreeMap<K, V>, E> {
         d.read_map(|d, len| {
             let mut map = BTreeMap::new();
             for i in range(0u, len) {
@@ -133,7 +132,7 @@ impl<
     D: Decoder<E>,
     T: Decodable<D, E> + PartialEq + Ord
 > Decodable<D, E> for BTreeSet<T> {
-    fn decode(d: &mut D) -> Result<TreeSet<T>, E> {
+    fn decode(d: &mut D) -> Result<BTreeSet<T>, E> {
         d.read_seq(|d, len| {
             let mut set = BTreeSet::new();
             for i in range(0u, len) {
@@ -255,63 +254,6 @@ fn decode(d: &mut D) -> Result<HashSet<T, H>, E> {
     }
 }
 
-impl<
-    E,
-    S: Encoder<E>,
-    V: Encodable<S, E>
-> Encodable<S, E> for TrieMap<V> {
-    fn encode(&self, e: &mut S) -> Result<(), E> {
-        e.emit_map(self.len(), |e| {
-                for (i, (key, val)) in self.iter().enumerate() {
-                    try!(e.emit_map_elt_key(i, |e| key.encode(e)));
-                    try!(e.emit_map_elt_val(i, |e| val.encode(e)));
-                }
-                Ok(())
-            })
-    }
-}
-
-impl<
-    E,
-    D: Decoder<E>,
-    V: Decodable<D, E>
-> Decodable<D, E> for TrieMap<V> {
-    fn decode(d: &mut D) -> Result<TrieMap<V>, E> {
-        d.read_map(|d, len| {
-            let mut map = TrieMap::new();
-            for i in range(0u, len) {
-                let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d)));
-                let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d)));
-                map.insert(key, val);
-            }
-            Ok(map)
-        })
-    }
-}
-
-impl<E, S: Encoder<E>> Encodable<S, E> for TrieSet {
-    fn encode(&self, s: &mut S) -> Result<(), E> {
-        s.emit_seq(self.len(), |s| {
-                for (i, e) in self.iter().enumerate() {
-                    try!(s.emit_seq_elt(i, |s| e.encode(s)));
-                }
-                Ok(())
-            })
-    }
-}
-
-impl<E, D: Decoder<E>> Decodable<D, E> for TrieSet {
-    fn decode(d: &mut D) -> Result<TrieSet, E> {
-        d.read_seq(|d, len| {
-            let mut set = TrieSet::new();
-            for i in range(0u, len) {
-                set.insert(try!(d.read_seq_elt(i, |d| Decodable::decode(d))));
-            }
-            Ok(set)
-        })
-    }
-}
-
 impl<
     E,
     S: Encoder<E>,

diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index 390b3976562ffacbb00d3a127e76f7f8ae20a9f1..e700d102fefda92ced017bf4fe73843ffd33922c 100644 (file)
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -33,6 +33,8 @@
 #[phase(plugin, link)]
 extern crate log;
 
+extern crate collections;
+
 pub use self::serialize::{Decoder, Encoder, Decodable, Encodable,
                           DecoderHelpers, EncoderHelpers};
 

diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index 02b266b8fe0b809d2a0e03b4a93cb6ec158aa8fc..d786409e895b299cd0cea252ae3cf5769cf8e924 100644 (file)
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -49,7 +49,7 @@
 use self::OutputLocation::*;
 
 use std::any::{Any, AnyRefExt};
-use std::collections::TreeMap;
+use std::collections::BTreeMap;
 use stats::Stats;
 use getopts::{OptGroup, optflag, optopt};
 use regex::Regex;
@@ -230,7 +230,7 @@ pub fn new(value: f64, noise: f64) -> Metric {
 }
 
 #[deriving(PartialEq)]
-pub struct MetricMap(TreeMap<String,Metric>);
+pub struct MetricMap(BTreeMap<String,Metric>);
 
 impl Clone for MetricMap {
     fn clone(&self) -> MetricMap {
@@ -1191,7 +1191,7 @@ fn calc_result(desc: &TestDesc, task_result: Result<(), Box<Any+Send>>) -> TestR
 impl MetricMap {
 
     pub fn new() -> MetricMap {
-        MetricMap(TreeMap::new())
+        MetricMap(BTreeMap::new())
     }
 
     /// Load MetricDiff from a file.

diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs
index ee57d01c36d362610e17cbdfd099848285e775fe..24480d85272059a405ddeed726c2c8dcdd623c64 100644 (file)
--- a/src/test/run-pass/send_str_treemap.rs
+++ b/src/test/run-pass/send_str_treemap.rs
@@ -10,7 +10,7 @@
 
 extern crate collections;
 
-use self::collections::TreeMap;
+use self::collections::BTreeMap;
 use std::option::Option::Some;
 use std::str::SendStr;
 use std::string::ToString;