]> git.lizzy.rs Git - rust.git/commit
rollup merge of #20721: japaric/snap
authorAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:26:58 +0000 (17:26 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 8 Jan 2015 01:26:58 +0000 (17:26 -0800)
commit6e806bdefde91af102567ef4b5dbd3ccf0c5c2ec
treeb8627ad2c80976f618b661ec14695f6a322ad1b3
parentf6a7dc5528a9a9ac36867bbca2a6044b7be5bce2
parent7d72719efc25c6cdb8963c187e93df646ba65245
rollup merge of #20721: japaric/snap

Conflicts:
src/libcollections/vec.rs
src/libcore/fmt/mod.rs
src/librustc/lint/builtin.rs
src/librustc/session/config.rs
src/librustc_trans/trans/base.rs
src/librustc_trans/trans/context.rs
src/librustc_trans/trans/type_.rs
src/librustc_typeck/check/_match.rs
src/librustdoc/html/format.rs
src/libsyntax/std_inject.rs
src/libsyntax/util/interner.rs
src/test/compile-fail/mut-pattern-mismatched.rs
49 files changed:
src/libcollections/bit.rs
src/libcollections/ring_buf.rs
src/libcollections/string.rs
src/libcollections/vec.rs
src/libcore/fmt/mod.rs
src/libcore/iter.rs
src/libcore/num/mod.rs
src/libcore/option.rs
src/libfmt_macros/lib.rs
src/libgetopts/lib.rs
src/libgraphviz/lib.rs
src/liblog/lib.rs
src/librand/lib.rs
src/librbml/lib.rs
src/librustc/lint/builtin.rs
src/librustc/lint/context.rs
src/librustc/metadata/csearch.rs
src/librustc/metadata/decoder.rs
src/librustc/metadata/encoder.rs
src/librustc/middle/ty.rs
src/librustc/session/config.rs
src/librustc/util/ppaux.rs
src/librustc_back/svh.rs
src/librustc_back/target/mod.rs
src/librustc_driver/lib.rs
src/librustc_resolve/lib.rs
src/librustc_trans/trans/base.rs
src/librustc_trans/trans/context.rs
src/librustc_trans/trans/monomorphize.rs
src/librustc_trans/trans/type_.rs
src/librustc_typeck/lib.rs
src/librustdoc/clean/mod.rs
src/librustdoc/html/format.rs
src/libserialize/json.rs
src/libstd/path/mod.rs
src/libstd/path/posix.rs
src/libstd/path/windows.rs
src/libsyntax/ast.rs
src/libsyntax/ast_map/mod.rs
src/libsyntax/ast_util.rs
src/libsyntax/codemap.rs
src/libsyntax/parse/parser.rs
src/libsyntax/std_inject.rs
src/libsyntax/util/interner.rs
src/libtest/lib.rs
src/test/compile-fail/packed-struct-generic-transmute.rs
src/test/run-pass/drop-trait-enum.rs
src/test/run-pass/issue-17503.rs
src/test/run-pass/repeated-vector-syntax.rs