}
}
-pub fn pretty_print_input(sess: Session,
+pub fn pretty_print_input(sess: &Session,
cstore: &CStore,
cfg: ast::CrateConfig,
input: &Input,
ppm: PpMode,
opt_uii: Option<UserIdentifiedItem>,
ofile: Option<PathBuf>) {
- let krate = panictry!(driver::phase_1_parse_input(&sess, cfg, input));
+ let krate = panictry!(driver::phase_1_parse_input(sess, cfg, input));
let krate = if let PpmSource(PpmEveryBodyLoops) = ppm {
let mut fold = ReplaceBodyWithLoop::new();
krate
};
- let id = link::find_crate_name(Some(&sess), &krate.attrs, input);
+ let id = link::find_crate_name(Some(sess), &krate.attrs, input);
let is_expanded = needs_expansion(&ppm);
let compute_ast_map = needs_ast_map(&ppm, &opt_uii);
let krate = if compute_ast_map {
- match driver::phase_2_configure_and_expand(&sess, &cstore, krate, &id, None) {
+ match driver::phase_2_configure_and_expand(sess, &cstore, krate, &id, None) {
Err(_) => return,
- Ok(k) => driver::assign_node_ids(&sess, k),
+ Ok(k) => driver::assign_node_ids(sess, k),
}
} else {
krate
let ast_map = if compute_ast_map {
_defs = Some(RefCell::new(hir_map::collect_definitions(&krate)));
let defs = _defs.as_ref().unwrap();
- LocalCrateReader::new(&sess, &cstore, defs, &krate, &id).read_crates(&dep_graph);
- let lcx = LoweringContext::new(&sess, Some(&krate), defs);
+ LocalCrateReader::new(sess, &cstore, defs, &krate, &id).read_crates(&dep_graph);
+ let lcx = LoweringContext::new(sess, Some(&krate), defs);
hir_forest = hir_map::Forest::new(lower_crate(&lcx, &krate), dep_graph.clone());
- Some(hir_map::map_crate(&mut hir_forest, defs))
+ let map = hir_map::map_crate(&mut hir_forest, defs);
+ Some(map)
} else {
None
};
(PpmSource(s), _) => {
// Silently ignores an identified node.
let out: &mut Write = &mut out;
- s.call_with_pp_support(&sess, ast_map, box out, |annotation, out| {
+ s.call_with_pp_support(sess, ast_map, box out, |annotation, out| {
debug!("pretty printing source code {:?}", s);
let sess = annotation.sess();
pprust::print_crate(sess.codemap(),
(PpmHir(s), None) => {
let out: &mut Write = &mut out;
- s.call_with_pp_support_hir(&sess,
+ s.call_with_pp_support_hir(sess,
&ast_map.unwrap(),
&arenas,
&id,
(PpmHir(s), Some(uii)) => {
let out: &mut Write = &mut out;
- s.call_with_pp_support_hir(&sess,
+ s.call_with_pp_support_hir(sess,
&ast_map.unwrap(),
&arenas,
&id,
let ast_map = ast_map.expect("--unpretty missing ast_map");
let nodeid = if let Some(uii) = uii {
debug!("pretty printing MIR for {:?}", uii);
- Some(uii.to_one_node_id("--unpretty", &sess, &ast_map))
+ Some(uii.to_one_node_id("--unpretty", sess, &ast_map))
} else {
debug!("pretty printing MIR for whole crate");
None
};
- abort_on_err(driver::phase_3_run_analysis_passes(&sess,
+ abort_on_err(driver::phase_3_run_analysis_passes(sess,
ast_map,
&arenas,
&id,
}
}
Ok(())
- }), &sess)
+ }), sess)
}
(PpmFlowGraph(mode), opt_uii) => {
});
let ast_map = ast_map.expect("--pretty flowgraph missing ast_map");
- let nodeid = uii.to_one_node_id("--pretty", &sess, &ast_map);
+ let nodeid = uii.to_one_node_id("--pretty", sess, &ast_map);
let node = ast_map.find(nodeid).unwrap_or_else(|| {
sess.fatal(&format!("--pretty flowgraph couldn't find id: {}", nodeid))
let out: &mut Write = &mut out;
match code {
Some(code) => {
- let variants = gather_flowgraph_variants(&sess);
- abort_on_err(driver::phase_3_run_analysis_passes(&sess,
+ let variants = gather_flowgraph_variants(sess);
+ abort_on_err(driver::phase_3_run_analysis_passes(sess,
ast_map,
&arenas,
&id,
code,
mode,
out)
- }), &sess)
+ }), sess)
}
None => {
let message = format!("--pretty=flowgraph needs block, fn, or method; got \