Skip to content

Commit e09bf82

Browse files
author
Jorge Aparicio
committed
enable enum_set tests
1 parent a079d5e commit e09bf82

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

src/libcollectionstest/enum_set.rs

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use std::collections::EnumSet;
11+
use std::mem;
12+
13+
use collections::enum_set::{CLike, EnumSet};
14+
15+
use self::Foo::*;
1216

1317
#[derive(Copy, PartialEq, Debug)]
1418
#[repr(usize)]
@@ -144,23 +148,23 @@ fn test_contains() {
144148
fn test_iterator() {
145149
let mut e1: EnumSet<Foo> = EnumSet::new();
146150

147-
let elems: ::vec::Vec<Foo> = e1.iter().collect();
151+
let elems: Vec<Foo> = e1.iter().collect();
148152
assert!(elems.is_empty());
149153

150154
e1.insert(A);
151-
let elems: ::vec::Vec<_> = e1.iter().collect();
155+
let elems: Vec<_> = e1.iter().collect();
152156
assert_eq!([A], elems);
153157

154158
e1.insert(C);
155-
let elems: ::vec::Vec<_> = e1.iter().collect();
159+
let elems: Vec<_> = e1.iter().collect();
156160
assert_eq!([A,C], elems);
157161

158162
e1.insert(C);
159-
let elems: ::vec::Vec<_> = e1.iter().collect();
163+
let elems: Vec<_> = e1.iter().collect();
160164
assert_eq!([A,C], elems);
161165

162166
e1.insert(B);
163-
let elems: ::vec::Vec<_> = e1.iter().collect();
167+
let elems: Vec<_> = e1.iter().collect();
164168
assert_eq!([A,B,C], elems);
165169
}
166170

@@ -178,35 +182,35 @@ fn test_operators() {
178182
e2.insert(C);
179183

180184
let e_union = e1 | e2;
181-
let elems: ::vec::Vec<_> = e_union.iter().collect();
185+
let elems: Vec<_> = e_union.iter().collect();
182186
assert_eq!([A,B,C], elems);
183187

184188
let e_intersection = e1 & e2;
185-
let elems: ::vec::Vec<_> = e_intersection.iter().collect();
189+
let elems: Vec<_> = e_intersection.iter().collect();
186190
assert_eq!([C], elems);
187191

188192
// Another way to express intersection
189193
let e_intersection = e1 - (e1 - e2);
190-
let elems: ::vec::Vec<_> = e_intersection.iter().collect();
194+
let elems: Vec<_> = e_intersection.iter().collect();
191195
assert_eq!([C], elems);
192196

193197
let e_subtract = e1 - e2;
194-
let elems: ::vec::Vec<_> = e_subtract.iter().collect();
198+
let elems: Vec<_> = e_subtract.iter().collect();
195199
assert_eq!([A], elems);
196200

197201
// Bitwise XOR of two sets, aka symmetric difference
198202
let e_symmetric_diff = e1 ^ e2;
199-
let elems: ::vec::Vec<_> = e_symmetric_diff.iter().collect();
203+
let elems: Vec<_> = e_symmetric_diff.iter().collect();
200204
assert_eq!([A,B], elems);
201205

202206
// Another way to express symmetric difference
203207
let e_symmetric_diff = (e1 - e2) | (e2 - e1);
204-
let elems: ::vec::Vec<_> = e_symmetric_diff.iter().collect();
208+
let elems: Vec<_> = e_symmetric_diff.iter().collect();
205209
assert_eq!([A,B], elems);
206210

207211
// Yet another way to express symmetric difference
208212
let e_symmetric_diff = (e1 | e2) - (e1 & e2);
209-
let elems: ::vec::Vec<_> = e_symmetric_diff.iter().collect();
213+
let elems: Vec<_> = e_symmetric_diff.iter().collect();
210214
assert_eq!([A,B], elems);
211215
}
212216

src/libcollectionstest/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ extern crate unicode;
3232
mod binary_heap;
3333
mod bit;
3434
mod btree;
35-
// FIXME(japaric) privacy
36-
//mod enum_set;
35+
mod enum_set;
3736
mod fmt;
3837
mod linked_list;
3938
mod slice;

0 commit comments

Comments
 (0)