]> git.lizzy.rs Git - rust.git/commit
rollup merge of #20482: kmcallister/macro-reform
authorAlex Crichton <alex@alexcrichton.com>
Tue, 6 Jan 2015 03:01:17 +0000 (19:01 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 6 Jan 2015 03:01:17 +0000 (19:01 -0800)
commit7975fd9cee750f26f9f6ef85b92a20b24ee24120
tree0c36840cd8bf89ad1f662ed81d8e71c93e22c41e
parent563f6d8218cf15bf2590507c38ce4cbb734d6bba
parent78e841d8b10e05b5bbad4b02a9d5f0e9611100c7
rollup merge of #20482: kmcallister/macro-reform

Conflicts:
src/libflate/lib.rs
src/libstd/lib.rs
src/libstd/macros.rs
src/libsyntax/feature_gate.rs
src/libsyntax/parse/parser.rs
src/libsyntax/show_span.rs
src/test/auxiliary/macro_crate_test.rs
src/test/compile-fail/lint-stability.rs
src/test/run-pass/intrinsics-math.rs
src/test/run-pass/tcp-connect-timeouts.rs
48 files changed:
src/compiletest/compiletest.rs
src/doc/reference.md
src/etc/vim/syntax/rust.vim
src/libcollections/lib.rs
src/libcollections/slice.rs
src/libcollections/str.rs
src/libcollections/string.rs
src/libcore/fmt/mod.rs
src/libcore/result.rs
src/libcore/str/mod.rs
src/libcoretest/lib.rs
src/libflate/lib.rs
src/liblog/macros.rs
src/librand/isaac.rs
src/librand/lib.rs
src/librustc/lint/context.rs
src/librustc/metadata/decoder.rs
src/librustc/metadata/encoder.rs
src/librustc/middle/const_eval.rs
src/librustc/middle/ty.rs
src/librustc_borrowck/borrowck/mod.rs
src/librustc_driver/driver.rs
src/librustc_driver/lib.rs
src/librustc_resolve/lib.rs
src/librustc_trans/trans/context.rs
src/librustc_typeck/lib.rs
src/libstd/collections/hash/set.rs
src/libstd/io/buffered.rs
src/libstd/io/mod.rs
src/libstd/lib.rs
src/libstd/macros.rs
src/libstd/path/posix.rs
src/libstd/path/windows.rs
src/libsyntax/ast.rs
src/libsyntax/ext/deriving/cmp/eq.rs
src/libsyntax/ext/deriving/cmp/ord.rs
src/libsyntax/ext/expand.rs
src/libsyntax/feature_gate.rs
src/libsyntax/fold.rs
src/libsyntax/parse/parser.rs
src/libsyntax/print/pprust.rs
src/libsyntax/visit.rs
src/test/auxiliary/logging_right_crate.rs
src/test/auxiliary/macro_crate_test.rs
src/test/compile-fail/lint-stability.rs
src/test/run-pass/intrinsics-math.rs
src/test/run-pass/issue-9129.rs
src/test/run-pass/tcp-connect-timeouts.rs