]> git.lizzy.rs Git - rust.git/commit
rollup merge of #22497: nikomatsakis/suffixes
authorAlex Crichton <alex@alexcrichton.com>
Wed, 18 Feb 2015 22:35:01 +0000 (14:35 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 18 Feb 2015 22:35:01 +0000 (14:35 -0800)
commit5250a82f7917d6f9ec590e7e762bfd036e21ef74
tree38ce94117b42eb159b630d0a97748b5f3056fbe5
parent5a32b4a34fc6fbd78e293b16f7ba7d06caca7a48
parent811c48fe22ffbe4ca45c32807c846d9a7c02a8f3
rollup merge of #22497: nikomatsakis/suffixes

Conflicts:
src/librustc_trans/trans/tvec.rs
22 files changed:
src/libcoretest/hash/mod.rs
src/librustc/lint/builtin.rs
src/librustc/util/ppaux.rs
src/librustc_trans/back/lto.rs
src/librustc_trans/trans/common.rs
src/librustc_trans/trans/expr.rs
src/librustc_trans/trans/tvec.rs
src/libstd/old_io/net/pipe.rs
src/libstd/old_path/posix.rs
src/libstd/old_path/windows.rs
src/libstd/rand/mod.rs
src/libstd/sys/unix/os.rs
src/libsyntax/ext/tt/macro_parser.rs
src/libtest/stats.rs
src/test/bench/shootout-meteor.rs
src/test/parse-fail/attr-before-let.rs
src/test/parse-fail/issue-1802-2.rs
src/test/parse-fail/issue-5544-a.rs
src/test/parse-fail/issue-5544-b.rs
src/test/parse-fail/issue-8537.rs
src/test/run-pass/foreign-fn-linkname.rs
src/test/run-pass/rename-directory.rs