From 73b9aeb4295aaf6c215c5981150bfa2ac9ace60a Mon Sep 17 00:00:00 2001
From: Alexis <a.beingessner@gmail.com>
Date: Thu, 5 Feb 2015 15:08:33 -0500
Subject: [PATCH] remove int_uint feature from libcollections

---
 src/libcollections/btree/set.rs |  6 +++---
 src/libcollections/slice.rs     |  4 ++--
 src/libcollections/vec.rs       | 10 +++++-----
 src/libcollections/vec_map.rs   |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/libcollections/btree/set.rs b/src/libcollections/btree/set.rs
index b02c522f86d..eb398ff8743 100644
--- a/src/libcollections/btree/set.rs
+++ b/src/libcollections/btree/set.rs
@@ -890,7 +890,7 @@ mod test {
     fn test_from_iter() {
         let xs = [1, 2, 3, 4, 5, 6, 7, 8, 9];
 
-        let set: BTreeSet<int> = xs.iter().map(|&x| x).collect();
+        let set: BTreeSet<_> = xs.iter().cloned().collect();
 
         for x in &xs {
             assert!(set.contains(x));
@@ -899,8 +899,8 @@ mod test {
 
     #[test]
     fn test_show() {
-        let mut set: BTreeSet<int> = BTreeSet::new();
-        let empty: BTreeSet<int> = BTreeSet::new();
+        let mut set = BTreeSet::new();
+        let empty = BTreeSet::<i32>::new();
 
         set.insert(1);
         set.insert(2);
diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs
index 64cdfd5acff..679754be749 100644
--- a/src/libcollections/slice.rs
+++ b/src/libcollections/slice.rs
@@ -1575,7 +1575,7 @@ mod tests {
 
     #[test]
     fn test_is_empty() {
-        let xs: [int; 0] = [];
+        let xs: [i32; 0] = [];
         assert!(xs.is_empty());
         assert!(![0].is_empty());
     }
@@ -1913,7 +1913,7 @@ mod tests {
     #[test]
     fn test_permutations() {
         {
-            let v: [int; 0] = [];
+            let v: [i32; 0] = [];
             let mut it = v.permutations();
             let (min_size, max_opt) = it.size_hint();
             assert_eq!(min_size, 1);
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index c6c8beec870..62640e1e250 100644
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -2146,10 +2146,10 @@ mod tests {
 
     #[test]
     fn test_partition() {
-        assert_eq!(vec![].into_iter().partition(|x: &int| *x < 3), (vec![], vec![]));
-        assert_eq!(vec![1, 2, 3].into_iter().partition(|x: &int| *x < 4), (vec![1, 2, 3], vec![]));
-        assert_eq!(vec![1, 2, 3].into_iter().partition(|x: &int| *x < 2), (vec![1], vec![2, 3]));
-        assert_eq!(vec![1, 2, 3].into_iter().partition(|x: &int| *x < 0), (vec![], vec![1, 2, 3]));
+        assert_eq!(vec![].into_iter().partition(|x: &i32| *x < 3), (vec![], vec![]));
+        assert_eq!(vec![1, 2, 3].into_iter().partition(|x| *x < 4), (vec![1, 2, 3], vec![]));
+        assert_eq!(vec![1, 2, 3].into_iter().partition(|x| *x < 2), (vec![1], vec![2, 3]));
+        assert_eq!(vec![1, 2, 3].into_iter().partition(|x| *x < 0), (vec![], vec![1, 2, 3]));
     }
 
     #[test]
@@ -2183,7 +2183,7 @@ mod tests {
     #[test]
     fn test_vec_truncate_drop() {
         static mut drops: u32 = 0;
-        struct Elem(int);
+        struct Elem(i32);
         impl Drop for Elem {
             fn drop(&mut self) {
                 unsafe { drops += 1; }
diff --git a/src/libcollections/vec_map.rs b/src/libcollections/vec_map.rs
index 1bb9fcf8192..4153c2a7de3 100644
--- a/src/libcollections/vec_map.rs
+++ b/src/libcollections/vec_map.rs
@@ -1053,7 +1053,7 @@ mod test_map {
         assert!(m.insert(10, 11).is_none());
 
         for (k, v) in &mut m {
-            *v += k as int;
+            *v += k as isize;
         }
 
         let mut it = m.iter();
@@ -1095,7 +1095,7 @@ mod test_map {
         assert!(m.insert(10, 11).is_none());
 
         for (k, v) in m.iter_mut().rev() {
-            *v += k as int;
+            *v += k as isize;
         }
 
         let mut it = m.iter();