bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename after_ast to after_hir_lowering.

Browse source
This commit is contained in:
Pavel Sountsov 2016-05-08 10:08:09 -07:00 • committed by SiegeLord
parent 105aa8c30f
commit 64cca3ab2d
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/librustc_driver/driver.rs
View file

@ -188,9 +188,9 @@ pub fn compile_input(sess: &Session,
{ {
let _ignore = hir_map.dep_graph.in_ignore(); let _ignore = hir_map.dep_graph.in_ignore();
controller_entry_point!(after_ast, controller_entry_point!(after_hir_lowering,
sess, sess,
CompileState::state_after_ast(input, CompileState::state_after_hir_lowering(input,
sess, sess,
outdir, outdir,
output, output,
@ -321,7 +321,7 @@ pub struct CompileController<'a> {
pub after_parse: PhaseController<'a>, pub after_parse: PhaseController<'a>,
pub after_expand: PhaseController<'a>, pub after_expand: PhaseController<'a>,
pub after_write_deps: PhaseController<'a>, pub after_write_deps: PhaseController<'a>,
pub after_ast: PhaseController<'a>, pub after_hir_lowering: PhaseController<'a>,
pub after_analysis: PhaseController<'a>, pub after_analysis: PhaseController<'a>,
pub after_llvm: PhaseController<'a>, pub after_llvm: PhaseController<'a>,
@ -334,7 +334,7 @@ impl<'a> CompileController<'a> {
after_parse: PhaseController::basic(), after_parse: PhaseController::basic(),
after_expand: PhaseController::basic(), after_expand: PhaseController::basic(),
after_write_deps: PhaseController::basic(), after_write_deps: PhaseController::basic(),
after_ast: PhaseController::basic(), after_hir_lowering: PhaseController::basic(),
after_analysis: PhaseController::basic(), after_analysis: PhaseController::basic(),
after_llvm: PhaseController::basic(), after_llvm: PhaseController::basic(),
make_glob_map: resolve::MakeGlobMap::No, make_glob_map: resolve::MakeGlobMap::No,
@ -458,19 +458,19 @@ impl<'a, 'b, 'ast, 'tcx> CompileState<'a, 'b, 'ast, 'tcx> {
} }
} }
fn state_after_ast(input: &'a Input, fn state_after_hir_lowering(input: &'a Input,
session: &'ast Session, session: &'ast Session,
out_dir: &'a Option<PathBuf>, out_dir: &'a Option<PathBuf>,
out_file: &'a Option<PathBuf>, out_file: &'a Option<PathBuf>,
arenas: &'ast ty::CtxtArenas<'ast>, arenas: &'ast ty::CtxtArenas<'ast>,
cstore: &'a CStore, cstore: &'a CStore,
hir_map: &'a hir_map::Map<'ast>, hir_map: &'a hir_map::Map<'ast>,
analysis: &'a ty::CrateAnalysis, analysis: &'a ty::CrateAnalysis,
resolutions: &'a Resolutions, resolutions: &'a Resolutions,
krate: &'a ast::Crate, krate: &'a ast::Crate,
hir_crate: &'a hir::Crate, hir_crate: &'a hir::Crate,
crate_name: &'a str) crate_name: &'a str)
-> CompileState<'a, 'b, 'ast, 'tcx> { -> CompileState<'a, 'b, 'ast, 'tcx> {
CompileState { CompileState {
crate_name: Some(crate_name), crate_name: Some(crate_name),
arenas: Some(arenas), arenas: Some(arenas),

4
src/librustc_driver/lib.rs
View file

@ -461,12 +461,12 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
if let Some((ppm, opt_uii)) = parse_pretty(sess, matches) { if let Some((ppm, opt_uii)) = parse_pretty(sess, matches) {
if ppm.needs_ast_map(&opt_uii) { if ppm.needs_ast_map(&opt_uii) {
control.after_ast.stop = Compilation::Stop; control.after_hir_lowering.stop = Compilation::Stop;
control.after_parse.callback = box move |state| { control.after_parse.callback = box move |state| {
state.krate = Some(pretty::fold_crate(state.krate.take().unwrap(), ppm)); state.krate = Some(pretty::fold_crate(state.krate.take().unwrap(), ppm));
}; };
control.after_ast.callback = box move |state| { control.after_hir_lowering.callback = box move |state| {
pretty::print_after_ast(state.session, pretty::print_after_ast(state.session,
state.ast_map.unwrap(), state.ast_map.unwrap(),
state.analysis.unwrap(), state.analysis.unwrap(),