]> git.lizzy.rs Git - rust.git/commit
rollup merge of #21457: alexcrichton/issue-21436
authorAlex Crichton <alex@alexcrichton.com>
Wed, 21 Jan 2015 17:20:35 +0000 (09:20 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 21 Jan 2015 17:20:35 +0000 (09:20 -0800)
commit87c3ee861ec488827044e07d5d0cd7c8508c681f
tree49a374a1baf3e3b816120ffdbf28959e10a5ea34
parente4b81d25122b0ff230182375d09300d5403b1750
parent3cb9fa26ef9905c00a29ea577fb55a12a91c8e7b
rollup merge of #21457: alexcrichton/issue-21436

Conflicts:
src/liballoc/boxed.rs
src/librustc/middle/traits/error_reporting.rs
src/libstd/sync/mpsc/mod.rs
48 files changed:
src/compiletest/common.rs
src/compiletest/runtest.rs
src/liballoc/boxed.rs
src/liballoc/rc.rs
src/libcollections/bit.rs
src/libcollections/btree/set.rs
src/libcollections/slice.rs
src/libcollections/vec.rs
src/libcore/lib.rs
src/libcore/ops.rs
src/libcore/str/mod.rs
src/libgetopts/lib.rs
src/liblog/lib.rs
src/libregex/parse.rs
src/librustc/middle/check_match.rs
src/librustc/middle/liveness.rs
src/librustc/middle/resolve_lifetime.rs
src/librustc/middle/traits/error_reporting.rs
src/librustc/middle/ty.rs
src/librustc/session/config.rs
src/librustc_resolve/lib.rs
src/librustc_trans/back/link.rs
src/librustc_trans/back/write.rs
src/librustc_typeck/variance.rs
src/librustdoc/html/format.rs
src/librustdoc/html/render.rs
src/librustdoc/lib.rs
src/libserialize/json.rs
src/libstd/collections/hash/map.rs
src/libstd/io/buffered.rs
src/libstd/io/mem.rs
src/libstd/io/mod.rs
src/libstd/io/process.rs
src/libstd/path/mod.rs
src/libstd/path/posix.rs
src/libstd/path/windows.rs
src/libstd/sync/mpsc/mod.rs
src/libsyntax/abi.rs
src/libsyntax/ast.rs
src/libsyntax/ast_map/mod.rs
src/libsyntax/attr.rs
src/libsyntax/diagnostic.rs
src/libsyntax/ext/format.rs
src/libsyntax/parse/lexer/mod.rs
src/libsyntax/parse/token.rs
src/libsyntax/util/interner.rs
src/libtest/lib.rs
src/test/run-pass/coerce-expect-unsized.rs