Skip to content

Minor refactoring/modernization/reintegration/enhancement of --pretty. #23017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Minor refactoring/modernization/reintegration/enhancement of --pretty. #23017

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
28d4a89
rustc_driver: hold references to contexts, instead of owning them, in…
eddyb Feb 26, 2015
16f6330
rustc: clean up a couple of workarounds that predate `FnOnce`.
eddyb Feb 26, 2015
e70c9a0
rustc_driver: refactor PrinterSupport away by localizing ownership to…
eddyb Feb 26, 2015
d4945b4
rustc_driver: move pretty-printing to the new driver controller API.
eddyb Feb 27, 2015
d12d316
rustc_driver: add -Z pretty-keep-going to continue compilation after …
eddyb Feb 27, 2015
13d51f4
rustc_driver: add -Z pretty-dump-dir to specify a directory for bulk …
eddyb Feb 27, 2015
fec2c12
rustc_driver: use `(expr: T)` in --pretty=typed, instead of `(expr as…
eddyb Feb 27, 2015
95593a6
syntax: support customization of literals in pretty-printing annotators.
eddyb Feb 27, 2015
fbffa94
rustc_driver: add --xpretty typed,unsuffixed_literals (integers and f…
eddyb Feb 28, 2015
c082ee2
rustdoc::test: use build_controller, rather than setting up CompileCo…
eddyb Feb 28, 2015
496c8ba
rustc_driver: add env var RUSTC_PRETTY_DUMP=mode:dir which acts like …
eddyb Mar 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rustc_driver: add -Z pretty-dump-dir to specify a directory for bulk … 
…--pretty dumps.
  • Loading branch information
@eddyb
eddyb committed Mar 4, 2015
commit 13d51f4935df1240b058c0a1f5c6ad35cabe472c
2 changes: 2 additions & 0 deletions src/librustc/session/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
"Include all dataflow analysis data in --pretty flowgraph output"),
pretty_keep_going: bool = (false, parse_bool,
"Do not stop after pretty-printing (use with --pretty)"),
pretty_dump_dir: Option<String> = (None, parse_opt_string,
"The directory where --pretty output will be saved"),
print_region_graph: bool = (false, parse_bool,
"Prints region inference graph. \
Use with RUST_REGION_GRAPH=help for more info"),
Expand Down
27 changes: 20 additions & 7 deletions src/librustc_driver/driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ pub fn compile_input(sess: Session,
&sess,
outdir,
output,
&outputs,
&expanded_crate,
&id[..]));

Expand All @@ -122,6 +123,7 @@ pub fn compile_input(sess: Session,
&sess,
outdir,
output,
&outputs,
&ast_map,
&ast_map.krate(),
&id[..]));
Expand All @@ -137,6 +139,7 @@ pub fn compile_input(sess: Session,
&analysis.ty_cx.sess,
outdir,
output,
&outputs,
analysis.ty_cx.map.krate(),
&analysis,
&analysis.ty_cx));
Expand Down Expand Up @@ -164,6 +167,7 @@ pub fn compile_input(sess: Session,
&sess,
outdir,
output,
&outputs,
&trans));

phase_6_link_output(&sess, &trans, &outputs);
Expand Down Expand Up @@ -259,17 +263,18 @@ impl<'a, 'tcx> CompileState<'a, 'tcx> {
fn empty(input: &'a Input,
session: &'a Session,
out_dir: &'a Option<Path>,
output: &'a Option<Path>)
output: &'a Option<Path>,
output_filenames: Option<&'a OutputFilenames>)
-> CompileState<'a, 'tcx> {
CompileState {
input: input,
session: session,
out_dir: out_dir.as_ref(),
output: output.as_ref(),
output_filenames: output_filenames,
cfg: None,
krate: None,
crate_name: None,
output_filenames: None,
expanded_crate: None,
ast_map: None,
analysis: None,
Expand All @@ -286,28 +291,31 @@ impl<'a, 'tcx> CompileState<'a, 'tcx> {
-> CompileState<'a, 'tcx> {
CompileState {
krate: Some(krate),
.. CompileState::empty(input, session, out_dir, output)
.. CompileState::empty(input, session, out_dir, output, None)
}
}

fn state_after_expand(input: &'a Input,
session: &'a Session,
out_dir: &'a Option<Path>,
output: &'a Option<Path>,
output_filenames: &'a OutputFilenames,
expanded_crate: &'a ast::Crate,
crate_name: &'a str)
-> CompileState<'a, 'tcx> {
CompileState {
crate_name: Some(crate_name),
expanded_crate: Some(expanded_crate),
.. CompileState::empty(input, session, out_dir, output)
.. CompileState::empty(input, session, out_dir, output,
Some(output_filenames))
}
}

fn state_after_write_deps(input: &'a Input,
session: &'a Session,
out_dir: &'a Option<Path>,
output: &'a Option<Path>,
output_filenames: &'a OutputFilenames,
ast_map: &'a ast_map::Map<'tcx>,
expanded_crate: &'a ast::Crate,
crate_name: &'a str)
Expand All @@ -316,14 +324,16 @@ impl<'a, 'tcx> CompileState<'a, 'tcx> {
crate_name: Some(crate_name),
ast_map: Some(ast_map),
expanded_crate: Some(expanded_crate),
.. CompileState::empty(input, session, out_dir, output)
.. CompileState::empty(input, session, out_dir, output,
Some(output_filenames))
}
}

fn state_after_analysis(input: &'a Input,
session: &'a Session,
out_dir: &'a Option<Path>,
output: &'a Option<Path>,
output_filenames: &'a OutputFilenames,
expanded_crate: &'a ast::Crate,
analysis: &'a ty::CrateAnalysis<'tcx>,
tcx: &'a ty::ctxt<'tcx>)
Expand All @@ -332,7 +342,8 @@ impl<'a, 'tcx> CompileState<'a, 'tcx> {
analysis: Some(analysis),
tcx: Some(tcx),
expanded_crate: Some(expanded_crate),
.. CompileState::empty(input, session, out_dir, output)
.. CompileState::empty(input, session, out_dir, output,
Some(output_filenames))
}
}

Expand All @@ -341,11 +352,13 @@ impl<'a, 'tcx> CompileState<'a, 'tcx> {
session: &'a Session,
out_dir: &'a Option<Path>,
output: &'a Option<Path>,
output_filenames: &'a OutputFilenames,
trans: &'a trans::CrateTranslation)
-> CompileState<'a, 'tcx> {
CompileState {
trans: Some(trans),
.. CompileState::empty(input, session, out_dir, output)
.. CompileState::empty(input, session, out_dir, output,
Some(output_filenames))
}
}
}
Expand Down
37 changes: 34 additions & 3 deletions src/librustc_driver/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ use std::cmp::Ordering::Equal;
use std::old_io::{self, stdio};
use std::iter::repeat;
use std::env;
use std::os;
use std::sync::mpsc::channel;
use std::thread;

Expand Down Expand Up @@ -235,7 +236,8 @@ pub trait CompilerCalls<'a> {
// CompilerCalls instance for a regular rustc build.
pub struct RustcDefaultCalls {
save_analysis: bool,
pretty_print: Option<(PpMode, Option<UserIdentifiedItem>)>
pretty_print: Option<(PpMode, Option<UserIdentifiedItem>)>,
pretty_dump_dir: Option<Path>
}

impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
Expand Down Expand Up @@ -310,6 +312,12 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
}));
}

if let Some(ref dir) = sess.opts.debugging_opts.pretty_dump_dir {
let pretty_dump_dir = os::getcwd().unwrap().join(dir);
assert!(pretty_dump_dir.is_absolute());
self.pretty_dump_dir = Some(pretty_dump_dir);
}

RustcDefaultCalls::print_crate_info(sess, Some(input), odir, ofile).and_then(
|| RustcDefaultCalls::list_metadata(sess, matches, input))
}
Expand Down Expand Up @@ -338,8 +346,30 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
if let Some((ppm, opt_uii)) = self.pretty_print.take() {
let phase = pretty::printing_phase(&mut control, ppm, opt_uii.as_ref());

let dump_dir = self.pretty_dump_dir.take();
phase.callback = box move |state| {
let output = state.output;
let pretty_output_path;
let output = if let Some(ref dir) = dump_dir {
let file_path = if let Some(outputs) = state.output_filenames {
outputs.with_extension("rs")
} else {
state.session.fatal(
"-Z pretty-dump-dir cannot be used with --pretty \
options that print before expansion");
};
let file_path = os::getcwd().unwrap().join(&file_path);
assert!(file_path.is_absolute());

// Cheap isomorphism: /foo/bar--bar/baz <-> foo--bar----bar--baz.
let components: Vec<_> = file_path.components().map(|bytes| {
String::from_utf8_lossy(bytes).replace("--", "----")
}).collect();

pretty_output_path = dir.join(components.connect("--"));
Some(&pretty_output_path)
} else {
state.output
};
pretty::print_from_phase(state, ppm, opt_uii.as_ref(), output).unwrap();
};

Expand Down Expand Up @@ -368,7 +398,8 @@ impl RustcDefaultCalls {
pub fn new() -> RustcDefaultCalls {
RustcDefaultCalls {
save_analysis: false,
pretty_print: None
pretty_print: None,
pretty_dump_dir: None
}
}

Expand Down