Merge Bitwise and BitCount traits and remove from prelude, along with Bounded

One less trait in std::num, and three less exported in the prelude.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libstd/num/i8.rs b/src/libstd/num/i8.rs
index fd123ec57cc..66162ce3502 100644
--- a/src/libstd/num/i8.rs
+++ b/src/libstd/num/i8.rs
@@ -15,7 +15,7 @@
 use prelude::*;
 
 use default::Default;
-use num::{BitCount, CheckedAdd, CheckedSub, CheckedMul};
+use num::{Bitwise, Bounded, CheckedAdd, CheckedSub, CheckedMul};
 use num::{CheckedDiv, Zero, One, strconv};
 use num::{ToStrRadix, FromStrRadix};
 use option::{Option, Some, None};
@@ -24,7 +24,7 @@ use unstable::intrinsics;
 
 int_module!(i8, 8)
 
-impl BitCount for i8 {
+impl Bitwise for i8 {
     /// Counts the number of bits set. Wraps LLVM's `ctpop` intrinsic.
     #[inline]
     fn population_count(&self) -> i8 { unsafe { intrinsics::ctpop8(*self) } }