]> git.lizzy.rs Git - rust.git/commit
rollup merge of #22210: aturon/stab-final-borrow
authorAlex Crichton <alex@alexcrichton.com>
Wed, 18 Feb 2015 23:34:32 +0000 (15:34 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 18 Feb 2015 23:34:48 +0000 (15:34 -0800)
commit2cdbd288ac0606902885434e1ccd8d8bde68913d
tree9a7d37f7dd44424182797c76d49ba0ece99f9513
parent365bd9a9e3b9dafa98e26982353fd28a6ca1efef
parenta99e698628cbd396c8100ef776d10ac61d911847
rollup merge of #22210: aturon/stab-final-borrow

Conflicts:
src/libcollections/btree/map.rs
src/libcollections/str.rs
src/libcollections/vec.rs
src/libcore/borrow.rs
src/libcore/hash/mod.rs
src/libstd/collections/hash/map.rs
src/libstd/collections/hash/set.rs
18 files changed:
src/liballoc/arc.rs
src/liballoc/rc.rs
src/libcollections/borrow.rs
src/libcollections/btree/map.rs
src/libcollections/btree/set.rs
src/libcollections/lib.rs
src/libcollections/str.rs
src/libcollections/string.rs
src/libcollections/vec.rs
src/libcore/hash/mod.rs
src/librustc/middle/ty.rs
src/libstd/collections/hash/map.rs
src/libstd/collections/hash/set.rs
src/libstd/ffi/os_str.rs
src/libstd/path.rs
src/libsyntax/util/interner.rs
src/test/run-make/save-analysis/foo.rs
src/test/run-pass/const-polymorphic-paths.rs