Skip to content

Commit 67d3823

Browse files
committed
enumset fallout
1 parent 0bd4dc6 commit 67d3823

File tree

7 files changed

+13
-68
lines changed

7 files changed

+13
-68
lines changed

src/librustc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ extern crate rustc_llvm;
3636
extern crate rustc_back;
3737
extern crate serialize;
3838
extern crate rbml;
39+
extern crate collections;
3940
#[phase(plugin, link)] extern crate log;
4041
#[phase(plugin, link)] extern crate syntax;
4142

src/librustc/middle/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ use std::hash::{Hash, sip, Writer};
7777
use std::mem;
7878
use std::ops;
7979
use std::rc::Rc;
80-
use std::collections::enum_set::{EnumSet, CLike};
80+
use collections::enum_set::{EnumSet, CLike};
8181
use std::collections::hash_map::{HashMap, Occupied, Vacant};
8282
use syntax::abi;
8383
use syntax::ast::{CrateNum, DefId, DUMMY_NODE_ID, Ident, ItemTrait, LOCAL_CRATE};

src/librustdoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ fn json_output(krate: clean::Crate, res: Vec<plugins::PluginJson> ,
472472
// "crate": { parsed crate ... },
473473
// "plugins": { output of plugins ... }
474474
// }
475-
let mut json = std::collections::TreeMap::new();
475+
let mut json = std::collections::BTreeMap::new();
476476
json.insert("schema".to_string(), Json::String(SCHEMA_VERSION.to_string()));
477477
let plugins_json = res.into_iter()
478478
.filter_map(|opt| {

src/libserialize/collection_impls.rs

+4-62
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ use std::default::Default;
1515
use std::hash::{Hash, Hasher};
1616

1717
use {Decodable, Encodable, Decoder, Encoder};
18-
use std::collections::{DList, RingBuf, BTreeMap, BTreeSet, HashMap, HashSet,
19-
TrieMap, TrieSet, VecMap};
20-
use std::collections::enum_set::{EnumSet, CLike};
18+
use std::collections::{DList, RingBuf, BTreeMap, BTreeSet, HashMap, HashSet, VecMap};
19+
use collections::enum_set::{EnumSet, CLike};
2120

2221
impl<
2322
E,
@@ -98,7 +97,7 @@ impl<
9897
K: Decodable<D, E> + PartialEq + Ord,
9998
V: Decodable<D, E> + PartialEq
10099
> Decodable<D, E> for BTreeMap<K, V> {
101-
fn decode(d: &mut D) -> Result<TreeMap<K, V>, E> {
100+
fn decode(d: &mut D) -> Result<BTreeMap<K, V>, E> {
102101
d.read_map(|d, len| {
103102
let mut map = BTreeMap::new();
104103
for i in range(0u, len) {
@@ -133,7 +132,7 @@ impl<
133132
D: Decoder<E>,
134133
T: Decodable<D, E> + PartialEq + Ord
135134
> Decodable<D, E> for BTreeSet<T> {
136-
fn decode(d: &mut D) -> Result<TreeSet<T>, E> {
135+
fn decode(d: &mut D) -> Result<BTreeSet<T>, E> {
137136
d.read_seq(|d, len| {
138137
let mut set = BTreeSet::new();
139138
for i in range(0u, len) {
@@ -255,63 +254,6 @@ impl<
255254
}
256255
}
257256

258-
impl<
259-
E,
260-
S: Encoder<E>,
261-
V: Encodable<S, E>
262-
> Encodable<S, E> for TrieMap<V> {
263-
fn encode(&self, e: &mut S) -> Result<(), E> {
264-
e.emit_map(self.len(), |e| {
265-
for (i, (key, val)) in self.iter().enumerate() {
266-
try!(e.emit_map_elt_key(i, |e| key.encode(e)));
267-
try!(e.emit_map_elt_val(i, |e| val.encode(e)));
268-
}
269-
Ok(())
270-
})
271-
}
272-
}
273-
274-
impl<
275-
E,
276-
D: Decoder<E>,
277-
V: Decodable<D, E>
278-
> Decodable<D, E> for TrieMap<V> {
279-
fn decode(d: &mut D) -> Result<TrieMap<V>, E> {
280-
d.read_map(|d, len| {
281-
let mut map = TrieMap::new();
282-
for i in range(0u, len) {
283-
let key = try!(d.read_map_elt_key(i, |d| Decodable::decode(d)));
284-
let val = try!(d.read_map_elt_val(i, |d| Decodable::decode(d)));
285-
map.insert(key, val);
286-
}
287-
Ok(map)
288-
})
289-
}
290-
}
291-
292-
impl<E, S: Encoder<E>> Encodable<S, E> for TrieSet {
293-
fn encode(&self, s: &mut S) -> Result<(), E> {
294-
s.emit_seq(self.len(), |s| {
295-
for (i, e) in self.iter().enumerate() {
296-
try!(s.emit_seq_elt(i, |s| e.encode(s)));
297-
}
298-
Ok(())
299-
})
300-
}
301-
}
302-
303-
impl<E, D: Decoder<E>> Decodable<D, E> for TrieSet {
304-
fn decode(d: &mut D) -> Result<TrieSet, E> {
305-
d.read_seq(|d, len| {
306-
let mut set = TrieSet::new();
307-
for i in range(0u, len) {
308-
set.insert(try!(d.read_seq_elt(i, |d| Decodable::decode(d))));
309-
}
310-
Ok(set)
311-
})
312-
}
313-
}
314-
315257
impl<
316258
E,
317259
S: Encoder<E>,

src/libserialize/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ extern crate test;
3333
#[phase(plugin, link)]
3434
extern crate log;
3535

36+
extern crate collections;
37+
3638
pub use self::serialize::{Decoder, Encoder, Decodable, Encodable,
3739
DecoderHelpers, EncoderHelpers};
3840

src/libtest/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ use self::NamePadding::*;
4949
use self::OutputLocation::*;
5050

5151
use std::any::{Any, AnyRefExt};
52-
use std::collections::TreeMap;
52+
use std::collections::BTreeMap;
5353
use stats::Stats;
5454
use getopts::{OptGroup, optflag, optopt};
5555
use regex::Regex;
@@ -230,7 +230,7 @@ impl Metric {
230230
}
231231

232232
#[deriving(PartialEq)]
233-
pub struct MetricMap(TreeMap<String,Metric>);
233+
pub struct MetricMap(BTreeMap<String,Metric>);
234234

235235
impl Clone for MetricMap {
236236
fn clone(&self) -> MetricMap {
@@ -1191,7 +1191,7 @@ fn calc_result(desc: &TestDesc, task_result: Result<(), Box<Any+Send>>) -> TestR
11911191
impl MetricMap {
11921192

11931193
pub fn new() -> MetricMap {
1194-
MetricMap(TreeMap::new())
1194+
MetricMap(BTreeMap::new())
11951195
}
11961196

11971197
/// Load MetricDiff from a file.

src/test/run-pass/send_str_treemap.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
extern crate collections;
1212

13-
use self::collections::TreeMap;
13+
use self::collections::BTreeMap;
1414
use std::option::Option::Some;
1515
use std::str::SendStr;
1616
use std::string::ToString;

0 commit comments

Comments
 (0)