Skip to content

Commit a76274e

Browse files
committed
Remove EnumSet
[unstable, deprecated since 1.16.0]
1 parent 535ee6c commit a76274e

File tree

5 files changed

+1
-343
lines changed

5 files changed

+1
-343
lines changed

src/doc/unstable-book/src/SUMMARY.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
- [derive_clone_copy](library-features/derive-clone-copy.md)
131131
- [derive_eq](library-features/derive-eq.md)
132132
- [discriminant_value](library-features/discriminant-value.md)
133-
- [enumset](library-features/enumset.md)
134133
- [error_type_id](library-features/error-type-id.md)
135134
- [exact_size_is_empty](library-features/exact-size-is-empty.md)
136135
- [fd](library-features/fd.md)

src/doc/unstable-book/src/library-features/enumset.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/libcollections/enum_set.rs

Lines changed: 0 additions & 313 deletions
This file was deleted.

src/libcollections/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@ pub use btree_set::BTreeSet;
8989
#[doc(no_inline)]
9090
pub use linked_list::LinkedList;
9191
#[doc(no_inline)]
92-
#[allow(deprecated)]
93-
pub use enum_set::EnumSet;
94-
#[doc(no_inline)]
9592
pub use vec_deque::VecDeque;
9693
#[doc(no_inline)]
9794
pub use string::String;
@@ -107,7 +104,6 @@ mod macros;
107104
pub mod binary_heap;
108105
mod btree;
109106
pub mod borrow;
110-
pub mod enum_set;
111107
pub mod fmt;
112108
pub mod linked_list;
113109
pub mod range;

src/test/run-pass/sync-send-iterators-in-libcollections.rs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@
1010

1111
#![allow(warnings)]
1212
#![feature(collections)]
13-
#![feature(drain, enumset, collections_bound, btree_range, vecmap)]
13+
#![feature(drain, collections_bound, btree_range, vecmap)]
1414

1515
extern crate collections;
1616

1717
use collections::BinaryHeap;
1818
use collections::{BTreeMap, BTreeSet};
19-
use collections::EnumSet;
2019
use collections::LinkedList;
2120
use collections::String;
2221
use collections::Vec;
@@ -25,7 +24,6 @@ use std::collections::HashMap;
2524
use std::collections::HashSet;
2625

2726
use collections::Bound::Included;
28-
use collections::enum_set::CLike;
2927
use std::mem;
3028

3129
fn is_sync<T>(_: T) where T: Sync {}
@@ -76,21 +74,6 @@ fn main() {
7674

7775
all_sync_send!(LinkedList::<usize>::new(), iter, iter_mut, into_iter);
7876

79-
#[derive(Copy, Clone)]
80-
#[repr(usize)]
81-
#[allow(dead_code)]
82-
enum Foo { A, B, C }
83-
impl CLike for Foo {
84-
fn to_usize(&self) -> usize {
85-
*self as usize
86-
}
87-
88-
fn from_usize(v: usize) -> Foo {
89-
unsafe { mem::transmute(v) }
90-
}
91-
}
92-
all_sync_send!(EnumSet::<Foo>::new(), iter);
93-
9477
all_sync_send!(VecDeque::<usize>::new(), iter, iter_mut, into_iter);
9578
is_sync_send!(VecDeque::<usize>::new(), drain(..));
9679

0 commit comments

Comments
 (0)