rollup merge of #21631: tbu-/isize_police

Conflicts:
	src/libcoretest/iter.rs

diff --cc src/liballoc/arc.rs
Simple merge

diff --cc src/libcollections/binary_heap.rs
Simple merge

diff --cc src/libcollections/btree/map.rs
Simple merge

diff --cc src/libcollections/btree/set.rs
Simple merge

diff --cc src/libcollections/dlist.rs
Simple merge

diff --cc src/libcollections/ring_buf.rs
Simple merge

diff --cc src/libcollections/slice.rs
Simple merge

diff --cc src/libcollections/string.rs
Simple merge

diff --cc src/libcollections/vec.rs
Simple merge

diff --cc src/libcollections/vec_map.rs
Simple merge

diff --cc src/libcoretest/iter.rs
index 2590b204502182e7959403571bf56060696ed87c,e6b0265576c4b6c2d91c183b7f02a4d657a4b600..2a872ef34437eef1f5639b45a29055c69603a15d
--- 1/src/libcoretest/iter.rs
--- 2/src/libcoretest/iter.rs
+++ b/src/libcoretest/iter.rs
@@@ -366,33 -366,33 +366,33 @@@ fn test_iterator_size_hint() 
      let vi = v.iter();
  
      assert_eq!(c.size_hint(), (uint::MAX, None));
 -    assert_eq!(vi.size_hint(), (10, Some(10)));
 -
 -    assert_eq!(c.take(5).size_hint(), (5, Some(5)));
 -    assert_eq!(c.skip(5).size_hint().1, None);
 -    assert_eq!(c.take_while(|_| false).size_hint(), (0, None));
 -    assert_eq!(c.skip_while(|_| false).size_hint(), (0, None));
 -    assert_eq!(c.enumerate().size_hint(), (uint::MAX, None));
 -    assert_eq!(c.chain(vi.map(|&i| i)).size_hint(), (uint::MAX, None));
 -    assert_eq!(c.zip(vi).size_hint(), (10, Some(10)));
 -    assert_eq!(c.scan(0, |_,_| Some(0)).size_hint(), (0, None));
 -    assert_eq!(c.filter(|_| false).size_hint(), (0, None));
 -    assert_eq!(c.map(|_| 0).size_hint(), (uint::MAX, None));
 +    assert_eq!(vi.clone().size_hint(), (10, Some(10)));
 +
 +    assert_eq!(c.clone().take(5).size_hint(), (5, Some(5)));
 +    assert_eq!(c.clone().skip(5).size_hint().1, None);
 +    assert_eq!(c.clone().take_while(|_| false).size_hint(), (0, None));
 +    assert_eq!(c.clone().skip_while(|_| false).size_hint(), (0, None));
 +    assert_eq!(c.clone().enumerate().size_hint(), (uint::MAX, None));
 +    assert_eq!(c.clone().chain(vi.clone().map(|&i| i)).size_hint(), (uint::MAX, None));
 +    assert_eq!(c.clone().zip(vi.clone()).size_hint(), (10, Some(10)));
-     assert_eq!(c.clone().scan(0i, |_,_| Some(0i)).size_hint(), (0, None));
++    assert_eq!(c.clone().scan(0i, |_,_| Some(0)).size_hint(), (0, None));
 +    assert_eq!(c.clone().filter(|_| false).size_hint(), (0, None));
-     assert_eq!(c.clone().map(|_| 0i).size_hint(), (uint::MAX, None));
-     assert_eq!(c.filter_map(|_| Some(0i)).size_hint(), (0, None));
++    assert_eq!(c.clone().map(|_| 0).size_hint(), (uint::MAX, None));
+     assert_eq!(c.filter_map(|_| Some(0)).size_hint(), (0, None));
  
 -    assert_eq!(vi.take(5).size_hint(), (5, Some(5)));
 -    assert_eq!(vi.take(12).size_hint(), (10, Some(10)));
 -    assert_eq!(vi.skip(3).size_hint(), (7, Some(7)));
 -    assert_eq!(vi.skip(12).size_hint(), (0, Some(0)));
 -    assert_eq!(vi.take_while(|_| false).size_hint(), (0, Some(10)));
 -    assert_eq!(vi.skip_while(|_| false).size_hint(), (0, Some(10)));
 -    assert_eq!(vi.enumerate().size_hint(), (10, Some(10)));
 -    assert_eq!(vi.chain(v2.iter()).size_hint(), (13, Some(13)));
 -    assert_eq!(vi.zip(v2.iter()).size_hint(), (3, Some(3)));
 -    assert_eq!(vi.scan(0, |_,_| Some(0)).size_hint(), (0, Some(10)));
 -    assert_eq!(vi.filter(|_| false).size_hint(), (0, Some(10)));
 -    assert_eq!(vi.map(|&i| i+1).size_hint(), (10, Some(10)));
 +    assert_eq!(vi.clone().take(5).size_hint(), (5, Some(5)));
 +    assert_eq!(vi.clone().take(12).size_hint(), (10, Some(10)));
 +    assert_eq!(vi.clone().skip(3).size_hint(), (7, Some(7)));
 +    assert_eq!(vi.clone().skip(12).size_hint(), (0, Some(0)));
 +    assert_eq!(vi.clone().take_while(|_| false).size_hint(), (0, Some(10)));
 +    assert_eq!(vi.clone().skip_while(|_| false).size_hint(), (0, Some(10)));
 +    assert_eq!(vi.clone().enumerate().size_hint(), (10, Some(10)));
 +    assert_eq!(vi.clone().chain(v2.iter()).size_hint(), (13, Some(13)));
 +    assert_eq!(vi.clone().zip(v2.iter()).size_hint(), (3, Some(3)));
-     assert_eq!(vi.clone().scan(0i, |_,_| Some(0i)).size_hint(), (0, Some(10)));
++    assert_eq!(vi.clone().scan(0i, |_,_| Some(0)).size_hint(), (0, Some(10)));
 +    assert_eq!(vi.clone().filter(|_| false).size_hint(), (0, Some(10)));
 +    assert_eq!(vi.clone().map(|&i| i+1).size_hint(), (10, Some(10)));
-     assert_eq!(vi.filter_map(|_| Some(0i)).size_hint(), (0, Some(10)));
+     assert_eq!(vi.filter_map(|_| Some(0)).size_hint(), (0, Some(10)));
  }
  
  #[test]

diff --cc src/libcoretest/num/int_macros.rs
Simple merge

diff --cc src/libcoretest/num/mod.rs
Simple merge

diff --cc src/librand/lib.rs
Simple merge

diff --cc src/librustc/lint/builtin.rs
Simple merge

diff --cc src/librustc_trans/save/span_utils.rs
Simple merge

diff --cc src/librustc_trans/trans/_match.rs
Simple merge

diff --cc src/libserialize/json.rs
Simple merge

diff --cc src/libstd/collections/hash/map.rs
Simple merge

diff --cc src/libstd/collections/hash/table.rs
Simple merge

diff --cc src/libstd/fmt.rs
Simple merge

diff --cc src/libstd/old_io/process.rs
Simple merge

diff --cc src/libstd/sync/mpsc/mod.rs
Simple merge

diff --cc src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs
Simple merge