diff options
| author | kennytm <kennytm@gmail.com> | 2018-02-25 15:54:54 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-02-25 21:30:51 +0800 |
| commit | eb0ab5e6b25ce536cbb3032c31aa131a8f7caaa6 (patch) | |
| tree | 1d4d58b894b232f7c70e9c22ceb5307ef41c924d /src/bootstrap/flags.rs | |
| parent | 4ab2184312b2c6eb000b6f9f5311d26d42b32857 (diff) | |
| parent | 264a92182e037c46cdcf37890e3142eaf634444d (diff) | |
Rollup merge of #48517 - penpalperson:master, r=Mark-Simulacrum
Added error-format flag to x.py. Fixes #48475 r? @Mark-Simulacrum
Diffstat (limited to 'src/bootstrap/flags.rs')
| -rw-r--r-- | src/bootstrap/flags.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs index eb5c3b8ce14..8ca5910a11c 100644 --- a/src/bootstrap/flags.rs +++ b/src/bootstrap/flags.rs @@ -43,6 +43,7 @@ pub struct Flags { pub cmd: Subcommand, pub incremental: bool, pub exclude: Vec<PathBuf>, + pub rustc_error_format: Option<String>, } pub enum Subcommand { @@ -118,6 +119,7 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`"); opts.optopt("", "src", "path to the root of the rust checkout", "DIR"); opts.optopt("j", "jobs", "number of jobs to run in parallel", "JOBS"); opts.optflag("h", "help", "print this help message"); + opts.optflag("", "error-format", "rustc error format"); // fn usage() let usage = |exit_code: i32, opts: &Options, subcommand_help: &str, extra_help: &str| -> ! { @@ -370,6 +372,7 @@ Arguments: verbose: matches.opt_count("verbose"), stage, on_fail: matches.opt_str("on-fail"), + rustc_error_format: matches.opt_str("error-format"), keep_stage: matches.opt_str("keep-stage").map(|j| j.parse().unwrap()), build: matches.opt_str("build").map(|s| INTERNER.intern_string(s)), host: split(matches.opt_strs("host")) |