@@ -15,9 +15,8 @@ use std::default::Default;
15
15
use std:: hash:: { Hash , Hasher } ;
16
16
17
17
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 } ;
21
20
22
21
impl <
23
22
E ,
98
97
K : Decodable < D , E > + PartialEq + Ord ,
99
98
V : Decodable < D , E > + PartialEq
100
99
> 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 > {
102
101
d. read_map ( |d, len| {
103
102
let mut map = BTreeMap :: new ( ) ;
104
103
for i in range ( 0 u, len) {
@@ -133,7 +132,7 @@ impl<
133
132
D : Decoder < E > ,
134
133
T : Decodable < D , E > + PartialEq + Ord
135
134
> 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 > {
137
136
d. read_seq ( |d, len| {
138
137
let mut set = BTreeSet :: new ( ) ;
139
138
for i in range ( 0 u, len) {
@@ -255,63 +254,6 @@ impl<
255
254
}
256
255
}
257
256
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 ( 0 u, 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 ( 0 u, len) {
308
- set. insert ( try!( d. read_seq_elt ( i, |d| Decodable :: decode ( d) ) ) ) ;
309
- }
310
- Ok ( set)
311
- } )
312
- }
313
- }
314
-
315
257
impl <
316
258
E ,
317
259
S : Encoder < E > ,
0 commit comments