bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

A few more code cleanups

Browse source
This commit is contained in:
LeSeulArtichaut 2021-02-19 19:08:12 +01:00
parent 3ed189e8af
commit dd3772e4f0
1 changed files with 18 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

52
compiler/rustc_driver/src/pretty.rs
View file

@ -391,16 +391,13 @@ pub fn print_after_parsing(
) { ) {
let (src, src_name) = get_source(input, sess); let (src, src_name) = get_source(input, sess);
let mut out = String::new(); let out = if let Source(s) = ppm {
if let Source(s) = ppm {
// Silently ignores an identified node. // Silently ignores an identified node.
let out = &mut out;
call_with_pp_support(&s, sess, None, move |annotation| { call_with_pp_support(&s, sess, None, move |annotation| {
debug!("pretty printing source code {:?}", s); debug!("pretty printing source code {:?}", s);
let sess = annotation.sess(); let sess = annotation.sess();
let parse = &sess.parse_sess; let parse = &sess.parse_sess;
*out = pprust::print_crate( pprust::print_crate(
sess.source_map(), sess.source_map(),
krate, krate,
src_name, src_name,
@ -411,7 +408,7 @@ pub fn print_after_parsing(
) )
}) })
} else { } else {
unreachable!(); unreachable!()
}; };
write_or_print(&out, ofile); write_or_print(&out, ofile);
@ -431,17 +428,14 @@ pub fn print_after_hir_lowering<'tcx>(
let (src, src_name) = get_source(input, tcx.sess); let (src, src_name) = get_source(input, tcx.sess);
let mut out = String::new(); let out = match ppm {
match ppm {
Source(s) => { Source(s) => {
// Silently ignores an identified node. // Silently ignores an identified node.
let out = &mut out;
call_with_pp_support(&s, tcx.sess, Some(tcx), move |annotation| { call_with_pp_support(&s, tcx.sess, Some(tcx), move |annotation| {
debug!("pretty printing source code {:?}", s); debug!("pretty printing source code {:?}", s);
let sess = annotation.sess(); let sess = annotation.sess();
let parse = &sess.parse_sess; let parse = &sess.parse_sess;
*out = pprust::print_crate( pprust::print_crate(
sess.source_map(), sess.source_map(),
krate, krate,
src_name, src_name,
@ -453,26 +447,20 @@ pub fn print_after_hir_lowering<'tcx>(
}) })
} }
Hir(s) => { Hir(s) => call_with_pp_support_hir(&s, tcx, move |annotation, krate| {
let out = &mut out; debug!("pretty printing HIR {:?}", s);
call_with_pp_support_hir(&s, tcx, move |annotation, krate| { let sess = annotation.sess();
debug!("pretty printing HIR {:?}", s); let sm = sess.source_map();
let sess = annotation.sess(); pprust_hir::print_crate(sm, krate, src_name, src, annotation.pp_ann())
let sm = sess.source_map(); }),
*out = pprust_hir::print_crate(sm, krate, src_name, src, annotation.pp_ann())
})
}
HirTree => { HirTree => call_with_pp_support_hir(&PpHirMode::Normal, tcx, move |_annotation, krate| {
let out = &mut out; debug!("pretty printing HIR tree");
call_with_pp_support_hir(&PpHirMode::Normal, tcx, move |_annotation, krate| { format!("{:#?}", krate)
debug!("pretty printing HIR tree"); }),
*out = format!("{:#?}", krate);
});
}
_ => unreachable!(), _ => unreachable!(),
} };
write_or_print(&out, ofile); write_or_print(&out, ofile);
} }
@ -491,14 +479,10 @@ fn print_with_analysis(
tcx.analysis(LOCAL_CRATE)?; tcx.analysis(LOCAL_CRATE)?;
match ppm { match ppm {
Mir | MirCFG => match ppm { Mir => write_mir_pretty(tcx, None, &mut out).unwrap(),
Mir => write_mir_pretty(tcx, None, &mut out), MirCFG => write_mir_graphviz(tcx, None, &mut out).unwrap(),
MirCFG => write_mir_graphviz(tcx, None, &mut out),
_ => unreachable!(),
},
_ => unreachable!(), _ => unreachable!(),
} }
.unwrap();
let out = std::str::from_utf8(&out).unwrap(); let out = std::str::from_utf8(&out).unwrap();
write_or_print(out, ofile); write_or_print(out, ofile);