Address nits

Author: jroesch

src/libcollections/enum_set.rs

@@ -82,8 +82,6 @@ pub use bit_set::BitSet;
 pub use btree_map::BTreeMap;
 pub use btree_set::BTreeSet;
 pub use linked_list::LinkedList;
-#[allow(deprecated)]
-pub use enum_set::EnumSet;
 pub use vec_deque::VecDeque;
 pub use string::String;
 pub use vec::Vec;
@@ -99,7 +97,6 @@ pub mod binary_heap;
 mod bit;
 mod btree;
 pub mod borrow;
-pub mod enum_set;
 pub mod fmt;
 pub mod linked_list;
 pub mod range;

src/libcollections/lib.rs

@@ -2068,23 +2068,11 @@ impl BuiltinBounds {
     }
 
     pub fn insert(&mut self, bound: BuiltinBound) {
-        self.bits = match bound {
-            BuiltinBound::Send  => self.bits | 0b0000_0001,
-            BuiltinBound::Sized => self.bits | 0b0000_0010,
-            BuiltinBound::Copy  => self.bits | 0b0000_0100,
-            BuiltinBound::Sync  => self.bits | 0b0000_1000,
-        }
+        self.bits |= 1 << (bound as u8);
     }
 
     pub fn contains(&self, bound: BuiltinBound) -> bool {
-        let bit = match bound {
-            BuiltinBound::Send  => self.bits,
-            BuiltinBound::Sized => self.bits >> 1,
-            BuiltinBound::Copy  => self.bits >> 2,
-            BuiltinBound::Sync  => self.bits >> 3
-        };
-
-        (bit & 0b0000_0001) == 1
+        ((self.bits >> (bound as u8)) & 1) == 1
     }
 
     pub fn iter(&self) -> BuiltinBoundsIter {

src/librustc/middle/ty.rs

@@ -10,15 +10,12 @@
 
 //! Implementations of serialization for structures found in libcollections
 
-use std::usize;
 use std::default::Default;
 use std::hash::Hash;
 use std::collections::hash_state::HashState;
 
 use {Decodable, Encodable, Decoder, Encoder};
 use std::collections::{LinkedList, VecDeque, BTreeMap, BTreeSet, HashMap, HashSet, VecMap};
-#[allow(deprecated)]
-use collections::enum_set::{EnumSet, CLike};
 
 impl<
     T: Encodable
@@ -131,35 +128,6 @@ impl<
     }
 }
 
-#[allow(deprecated)]
-impl<
-    T: Encodable + CLike
-> Encodable for EnumSet<T> {
-    fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
-        let mut bits = 0;
-        for item in self {
-            bits |= item.to_usize();
-        }
-        s.emit_uint(bits)
-    }
-}
-
-#[allow(deprecated)]
-impl<
-    T: Decodable + CLike
-> Decodable for EnumSet<T> {
-    fn decode<D: Decoder>(d: &mut D) -> Result<EnumSet<T>, D::Error> {
-        let bits = try!(d.read_uint());
-        let mut set = EnumSet::new();
-        for bit in 0..usize::BITS {
-            if bits & (1 << bit) != 0 {
-                set.insert(CLike::from_usize(1 << bit));
-            }
-        }
-        Ok(set)
-    }
-}
-
 impl<K, V, S> Encodable for HashMap<K, V, S>
     where K: Encodable + Hash + Eq,
           V: Encodable,

src/libserialize/collection_impls.rs

@@ -29,9 +29,7 @@ Core encoding and decoding interfaces.
 
 #![feature(box_syntax)]
 #![feature(collections)]
-#![feature(enumset)]
 #![feature(hashmap_hasher)]
-#![feature(num_bits_bytes)]
 #![feature(rustc_private)]
 #![feature(staged_api)]
 #![feature(str_char)]