Merge the Bitwise and ByteOrder traits into the Int trait

This reduces the complexity of the trait hierarchy.

1 files changed, 1 insertions, 3 deletions

diff --git a/src/libserialize/ebml.rs b/src/libserialize/ebml.rs
index a1c79bc0b75..7d0c82fc9a2 100644
--- a/src/libserialize/ebml.rs
+++ b/src/libserialize/ebml.rs
@@ -154,8 +154,6 @@ pub mod reader {
     }
 
     pub fn vuint_at(data: &[u8], start: uint) -> DecodeResult<Res> {
-        use std::mem::ByteOrder;
-
         if data.len() - start < 4 {
             return vuint_at_slow(data, start);
         }
@@ -185,7 +183,7 @@ pub mod reader {
 
         unsafe {
             let ptr = data.as_ptr().offset(start as int) as *u32;
-            let val = ByteOrder::from_big_endian(*ptr);
+            let val = Int::from_big_endian(*ptr);
 
             let i = (val >> 28u) as uint;
             let (shift, mask) = SHIFT_MASK_TABLE[i];