Skip to content

Commit cd138dc

Browse files
committedSep 2, 2015
Auto merge of #28138 - nrc:hir, r=nikomatsakis
r? @nikomatsakis Trying to land this first stab, which basically just duplicates the AST. Will file issues for the various things I've got in mind to improve.
2 parents b7b1dce + facdf2e commit cd138dc

File tree

160 files changed

+13918
-4452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+13918
-4452
lines changed
 

‎mk/crates.mk

+10-9
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ TARGET_CRATES := libc std flate arena term \
5656
alloc_system
5757
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
5858
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
59-
rustc_data_structures rustc_platform_intrinsics
59+
rustc_data_structures rustc_front rustc_platform_intrinsics
6060
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
6161
TOOLS := compiletest rustdoc rustc rustbook error-index-generator
6262

@@ -71,23 +71,24 @@ DEPS_graphviz := std
7171
DEPS_syntax := std term serialize log fmt_macros arena libc rustc_bitflags
7272
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
7373
rustc_typeck rustc_resolve log syntax serialize rustc_llvm \
74-
rustc_trans rustc_privacy rustc_lint
74+
rustc_trans rustc_privacy rustc_lint rustc_front
7575

7676
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
77-
log syntax serialize rustc_llvm rustc_platform_intrinsics
78-
DEPS_rustc_typeck := rustc syntax rustc_platform_intrinsics
79-
DEPS_rustc_borrowck := rustc log graphviz syntax
80-
DEPS_rustc_resolve := rustc log syntax
81-
DEPS_rustc_privacy := rustc log syntax
77+
log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics
78+
DEPS_rustc_typeck := rustc syntax rustc_front rustc_platform_intrinsics
79+
DEPS_rustc_borrowck := rustc rustc_front log graphviz syntax
80+
DEPS_rustc_resolve := rustc rustc_front log syntax
81+
DEPS_rustc_privacy := rustc rustc_front log syntax
8282
DEPS_rustc_lint := rustc log syntax
8383
DEPS_rustc := syntax flate arena serialize getopts rbml \
8484
log graphviz rustc_llvm rustc_back rustc_data_structures
8585
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
8686
DEPS_rustc_platform_intrinsics := rustc rustc_llvm
87-
DEPS_rustc_back := std syntax rustc_llvm flate log libc
87+
DEPS_rustc_back := std syntax rustc_llvm rustc_front flate log libc
88+
DEPS_rustc_front := std syntax log serialize
8889
DEPS_rustc_data_structures := std log serialize
8990
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
90-
test rustc_lint
91+
test rustc_lint rustc_front
9192
DEPS_rustc_bitflags := core
9293
DEPS_flate := std native:miniz
9394
DEPS_arena := std

‎src/compiletest/runtest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ fn run_pretty_test(config: &Config, props: &TestProps, testfile: &Path) {
268268
// FIXME (#9639): This needs to handle non-utf8 paths
269269
let mut args = vec!("-".to_owned(),
270270
"-Zunstable-options".to_owned(),
271-
"--pretty".to_owned(),
271+
"--unpretty".to_owned(),
272272
pretty_type,
273273
format!("--target={}", config.target),
274274
"-L".to_owned(),

0 commit comments

Comments
 (0)