]> git.lizzy.rs Git - rust.git/commit
rollup merge of #21631: tbu-/isize_police
authorAlex Crichton <alex@alexcrichton.com>
Fri, 30 Jan 2015 20:14:40 +0000 (12:14 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Fri, 30 Jan 2015 21:27:02 +0000 (13:27 -0800)
commit188d7c0bc36e69b99f6bdefd613027e53fa8b2d0
tree5605bccb8c49ba1baa92cc2132778403d16e58ce
parent4c25687c2bf8d83f1e26bd6aad6d2eb807c5b254
parent7f64fe4e27555c256cb228feb05d4181a2287125
rollup merge of #21631: tbu-/isize_police

Conflicts:
src/libcoretest/iter.rs
24 files changed:
src/liballoc/arc.rs
src/libcollections/binary_heap.rs
src/libcollections/btree/map.rs
src/libcollections/btree/set.rs
src/libcollections/dlist.rs
src/libcollections/ring_buf.rs
src/libcollections/slice.rs
src/libcollections/string.rs
src/libcollections/vec.rs
src/libcollections/vec_map.rs
src/libcoretest/iter.rs
src/libcoretest/num/int_macros.rs
src/libcoretest/num/mod.rs
src/librand/lib.rs
src/librustc/lint/builtin.rs
src/librustc_trans/save/span_utils.rs
src/librustc_trans/trans/_match.rs
src/libserialize/json.rs
src/libstd/collections/hash/map.rs
src/libstd/collections/hash/table.rs
src/libstd/fmt.rs
src/libstd/old_io/process.rs
src/libstd/sync/mpsc/mod.rs
src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs