OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also rename the print_from_ast.

Browse Source
This commit is contained in:
Pavel Sountsov 2016-05-10 19:21:44 -07:00 committed by SiegeLord
parent a75fc0d23c
commit ba04a52b96
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/librustc_driver/lib.rs
View File

@ -467,17 +467,17 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
state.krate = Some(pretty::fold_crate(state.krate.take().unwrap(), ppm)); state.krate = Some(pretty::fold_crate(state.krate.take().unwrap(), ppm));
}; };
control.after_hir_lowering.callback = box move |state| { control.after_hir_lowering.callback = box move |state| {
pretty::print_after_ast(state.session, pretty::print_after_hir_lowering(state.session,
state.ast_map.unwrap(), state.ast_map.unwrap(),
state.analysis.unwrap(), state.analysis.unwrap(),
state.resolutions.unwrap(), state.resolutions.unwrap(),
state.input, state.input,
&state.expanded_crate.take().unwrap(), &state.expanded_crate.take().unwrap(),
state.crate_name.unwrap(), state.crate_name.unwrap(),
ppm, ppm,
state.arenas.unwrap(), state.arenas.unwrap(),
opt_uii.clone(), opt_uii.clone(),
state.out_file); state.out_file);
}; };
} else { } else {
control.after_parse.stop = Compilation::Stop; control.after_parse.stop = Compilation::Stop;

22
src/librustc_driver/pretty.rs
View File

@ -812,17 +812,17 @@ pub fn print_after_parsing(sess: &Session,
write_output(out, ofile); write_output(out, ofile);
} }
pub fn print_after_ast<'tcx, 'a: 'tcx>(sess: &'a Session, pub fn print_after_hir_lowering<'tcx, 'a: 'tcx>(sess: &'a Session,
ast_map: &hir_map::Map<'tcx>, ast_map: &hir_map::Map<'tcx>,
analysis: &ty::CrateAnalysis, analysis: &ty::CrateAnalysis,
resolutions: &Resolutions, resolutions: &Resolutions,
input: &Input, input: &Input,
krate: &ast::Crate, krate: &ast::Crate,
crate_name: &str, crate_name: &str,
ppm: PpMode, ppm: PpMode,
arenas: &'tcx ty::CtxtArenas<'tcx>, arenas: &'tcx ty::CtxtArenas<'tcx>,
opt_uii: Option<UserIdentifiedItem>, opt_uii: Option<UserIdentifiedItem>,
ofile: Option<&Path>) { ofile: Option<&Path>) {
let dep_graph = DepGraph::new(false); let dep_graph = DepGraph::new(false);
let _ignore = dep_graph.in_ignore(); let _ignore = dep_graph.in_ignore();