From 7a5a1f98572887d9642c7321be6c0d5abf7aaffb Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Sat, 18 Nov 2017 20:16:10 +0000 Subject: [PATCH] use -Z flag instead of env var --- src/librustc/session/config.rs | 2 + src/librustc/session/mod.rs | 7 ++- src/librustc_driver/lib.rs | 4 +- src/librustc_driver/test.rs | 2 +- src/librustc_errors/diagnostic_builder.rs | 2 +- src/librustc_errors/emitter.rs | 51 +++++++++++-------- src/librustc_errors/lib.rs | 6 ++- src/librustc_trans/back/write.rs | 2 +- src/librustdoc/core.rs | 1 + src/librustdoc/test.rs | 4 +- src/libsyntax/parse/lexer/mod.rs | 2 +- src/libsyntax/parse/mod.rs | 1 + src/libsyntax/test_snippet.rs | 2 +- .../ui/codemap_tests/bad-format-args.stderr | 6 +-- src/test/ui/codemap_tests/issue-28308.stderr | 2 +- .../cross-crate-macro-backtrace/main.stderr | 2 +- src/test/ui/fmt/format-string-error.stderr | 4 +- .../lifetimes/borrowck-let-suggestion.stderr | 2 +- src/test/ui/macro_backtrace/main.rs | 2 +- src/test/ui/macros/format-foreign.stderr | 2 +- .../ui/macros/format-unused-lables.stderr | 6 +-- src/test/ui/reachable/expr_again.stderr | 2 +- src/test/ui/reachable/expr_block.stderr | 2 +- src/test/ui/reachable/expr_if.stderr | 2 +- src/test/ui/reachable/expr_loop.stderr | 6 +-- src/test/ui/reachable/expr_match.stderr | 4 +- src/test/ui/reachable/expr_while.stderr | 6 +-- src/test/ui/span/coerce-suggestions.stderr | 2 +- src/test/ui/span/issue-33884.stderr | 2 +- src/test/ui/span/issue-40157.stderr | 2 +- src/test/ui/span/slice-borrow.stderr | 2 +- .../cannot_infer_local_or_vec.stderr | 2 +- ...cannot_infer_local_or_vec_in_tuples.stderr | 2 +- 33 files changed, 83 insertions(+), 63 deletions(-) diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index 57fae2200e2..25123acdc67 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -1036,6 +1036,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options, "run all passes except translation; no output"), treat_err_as_bug: bool = (false, parse_bool, [TRACKED], "treat all errors that occur as bugs"), + macro_backtrace: bool = (false, parse_bool, [UNTRACKED], + "show macro backtraces even for foreign macros"), continue_parse_after_error: bool = (false, parse_bool, [TRACKED], "attempt to recover from parse errors (experimental)"), incremental: Option = (None, parse_opt_string, [UNTRACKED], diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs index 00a91eeb9c1..ab270648f3a 100644 --- a/src/librustc/session/mod.rs +++ b/src/librustc/session/mod.rs @@ -731,6 +731,8 @@ pub fn build_session_with_codemap(sopts: config::Options, let treat_err_as_bug = sopts.debugging_opts.treat_err_as_bug; + let macro_backtrace = sopts.debugging_opts.macro_backtrace; + let emitter: Box = match (sopts.error_format, emitter_dest) { (config::ErrorOutputType::HumanReadable(color_config), None) => { Box::new(EmitterWriter::stderr(color_config, Some(codemap.clone()), false)) @@ -755,6 +757,7 @@ pub fn build_session_with_codemap(sopts: config::Options, let diagnostic_handler = errors::Handler::with_emitter(can_print_warnings, treat_err_as_bug, + macro_backtrace, emitter); build_session_(sopts, @@ -925,7 +928,7 @@ pub fn early_error(output: config::ErrorOutputType, msg: &str) -> ! { Box::new(EmitterWriter::stderr(color_config, None, true)) } }; - let handler = errors::Handler::with_emitter(true, false, emitter); + let handler = errors::Handler::with_emitter(true, false, false, emitter); handler.emit(&MultiSpan::new(), msg, errors::Level::Fatal); panic!(errors::FatalError); } @@ -940,7 +943,7 @@ pub fn early_warn(output: config::ErrorOutputType, msg: &str) { Box::new(EmitterWriter::stderr(color_config, None, true)) } }; - let handler = errors::Handler::with_emitter(true, false, emitter); + let handler = errors::Handler::with_emitter(true, false, false, emitter); handler.emit(&MultiSpan::new(), msg, errors::Level::Warning); } diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index c5cce70c945..2f847e3dd97 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -141,7 +141,7 @@ pub fn run(run_compiler: F) -> isize errors::emitter::EmitterWriter::stderr(errors::ColorConfig::Auto, None, true); - let handler = errors::Handler::with_emitter(true, false, Box::new(emitter)); + let handler = errors::Handler::with_emitter(true, false, false, Box::new(emitter)); handler.emit(&MultiSpan::new(), "aborting due to previous error(s)", errors::Level::Fatal); @@ -1221,7 +1221,7 @@ pub fn monitor(f: F) { Box::new(errors::emitter::EmitterWriter::stderr(errors::ColorConfig::Auto, None, false)); - let handler = errors::Handler::with_emitter(true, false, emitter); + let handler = errors::Handler::with_emitter(true, false, false, emitter); // a .span_bug or .bug call has already printed what // it wants to print. diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index 78ce959e5c9..8a4cc237805 100644 --- a/src/librustc_driver/test.rs +++ b/src/librustc_driver/test.rs @@ -104,7 +104,7 @@ fn test_env(source_string: &str, let mut options = config::basic_options(); options.debugging_opts.verbose = true; options.unstable_features = UnstableFeatures::Allow; - let diagnostic_handler = errors::Handler::with_emitter(true, false, emitter); + let diagnostic_handler = errors::Handler::with_emitter(true, false, false, emitter); let cstore = Rc::new(CStore::new(::DefaultTransCrate::metadata_loader())); let sess = session::build_session_(options, diff --git a/src/librustc_errors/diagnostic_builder.rs b/src/librustc_errors/diagnostic_builder.rs index 40b5810454b..27e895164e7 100644 --- a/src/librustc_errors/diagnostic_builder.rs +++ b/src/librustc_errors/diagnostic_builder.rs @@ -23,7 +23,7 @@ use syntax_pos::{MultiSpan, Span}; #[must_use] #[derive(Clone)] pub struct DiagnosticBuilder<'a> { - handler: &'a Handler, + pub handler: &'a Handler, diagnostic: Diagnostic, } diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs index 41672d89486..f3f5b443a43 100644 --- a/src/librustc_errors/emitter.rs +++ b/src/librustc_errors/emitter.rs @@ -23,7 +23,6 @@ use std::rc::Rc; use term; use std::collections::HashMap; use std::cmp::min; -use std::env; /// Emitter trait for emitting errors. pub trait Emitter { @@ -65,8 +64,11 @@ impl Emitter for EmitterWriter { } } - self.fix_multispans_in_std_macros(&mut primary_span, &mut children); + if !db.handler.macro_backtrace { + self.fix_multispans_in_std_macros(&mut primary_span, &mut children); + } self.emit_messages_default(&db.level, + db.handler.macro_backtrace, &db.styled_message(), &db.code, &primary_span, @@ -787,23 +789,21 @@ impl EmitterWriter { fn fix_multispans_in_std_macros(&mut self, span: &mut MultiSpan, children: &mut Vec) { - if env::var_os("RUST_MACRO_BACKTRACE").is_none() { - let mut spans_updated = self.fix_multispan_in_std_macros(span); - for child in children.iter_mut() { - spans_updated |= self.fix_multispan_in_std_macros(&mut child.span); - } - if spans_updated { - children.push(SubDiagnostic { - level: Level::Note, - message: vec![ - (["this error originates in a macro outside of the current crate", - "(run with RUST_MACRO_BACKTRACE=1 for more info)"].join(" "), - Style::NoStyle), - ], - span: MultiSpan::new(), - render_span: None, - }); - } + let mut spans_updated = self.fix_multispan_in_std_macros(span); + for child in children.iter_mut() { + spans_updated |= self.fix_multispan_in_std_macros(&mut child.span); + } + if spans_updated { + children.push(SubDiagnostic { + level: Level::Note, + message: vec![ + (["this error originates in a macro outside of the current crate", + "(run with -Z macro-backtrace for more info)"].join(" "), + Style::NoStyle), + ], + span: MultiSpan::new(), + render_span: None, + }); } } @@ -888,6 +888,7 @@ impl EmitterWriter { msg: &Vec<(String, Style)>, code: &Option, level: &Level, + macro_backtrace: bool, max_line_num_len: usize, is_secondary: bool) -> io::Result<()> { @@ -1085,7 +1086,7 @@ impl EmitterWriter { } } - if env::var_os("RUST_MACRO_BACKTRACE").is_some() { + if macro_backtrace { if let Some(ref primary_span) = msp.primary_span().as_ref() { self.render_macro_backtrace_old_school(primary_span, &mut buffer)?; } @@ -1182,6 +1183,7 @@ impl EmitterWriter { } fn emit_messages_default(&mut self, level: &Level, + macro_backtrace: bool, message: &Vec<(String, Style)>, code: &Option, span: &MultiSpan, @@ -1190,7 +1192,13 @@ impl EmitterWriter { let max_line_num = self.get_max_line_num(span, children); let max_line_num_len = max_line_num.to_string().len(); - match self.emit_message_default(span, message, code, level, max_line_num_len, false) { + match self.emit_message_default(span, + message, + code, + level, + macro_backtrace, + max_line_num_len, + false) { Ok(()) => { if !children.is_empty() { let mut buffer = StyledBuffer::new(); @@ -1210,6 +1218,7 @@ impl EmitterWriter { &child.styled_message(), &None, &child.level, + macro_backtrace, max_line_num_len, true) { Err(e) => panic!("failed to emit error: {}", e), diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs index e83ac8831de..99d94aaf912 100644 --- a/src/librustc_errors/lib.rs +++ b/src/librustc_errors/lib.rs @@ -237,6 +237,7 @@ pub struct Handler { emitter: RefCell>, pub can_emit_warnings: bool, treat_err_as_bug: bool, + pub macro_backtrace: bool, continue_after_error: Cell, delayed_span_bug: RefCell>, tracked_diagnostics: RefCell>>, @@ -251,14 +252,16 @@ impl Handler { pub fn with_tty_emitter(color_config: ColorConfig, can_emit_warnings: bool, treat_err_as_bug: bool, + macro_backtrace: bool, cm: Option>) -> Handler { let emitter = Box::new(EmitterWriter::stderr(color_config, cm, false)); - Handler::with_emitter(can_emit_warnings, treat_err_as_bug, emitter) + Handler::with_emitter(can_emit_warnings, treat_err_as_bug, macro_backtrace, emitter) } pub fn with_emitter(can_emit_warnings: bool, treat_err_as_bug: bool, + macro_backtrace: bool, e: Box) -> Handler { Handler { @@ -266,6 +269,7 @@ impl Handler { emitter: RefCell::new(e), can_emit_warnings, treat_err_as_bug, + macro_backtrace, continue_after_error: Cell::new(true), delayed_span_bug: RefCell::new(None), tracked_diagnostics: RefCell::new(None), diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs index e443f13a7a1..180a2f4ed6c 100644 --- a/src/librustc_trans/back/write.rs +++ b/src/librustc_trans/back/write.rs @@ -353,7 +353,7 @@ pub struct CodegenContext { impl CodegenContext { pub fn create_diag_handler(&self) -> Handler { - Handler::with_emitter(true, false, Box::new(self.diag_emitter.clone())) + Handler::with_emitter(true, false, false, Box::new(self.diag_emitter.clone())) } pub fn config(&self, kind: ModuleKind) -> &ModuleConfig { diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs index 9172bfcde3f..8db6cb51ce4 100644 --- a/src/librustdoc/core.rs +++ b/src/librustdoc/core.rs @@ -141,6 +141,7 @@ pub fn run_core(search_paths: SearchPaths, let diagnostic_handler = errors::Handler::with_tty_emitter(ColorConfig::Auto, true, false, + false, Some(codemap.clone())); let cstore = Rc::new(CStore::new(box rustc_trans::LlvmMetadataLoader)); diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 9bbd16355be..03cb77422cf 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -81,7 +81,7 @@ pub fn run(input: &str, let codemap = Rc::new(CodeMap::new(sessopts.file_path_mapping())); let handler = - errors::Handler::with_tty_emitter(ColorConfig::Auto, true, false, Some(codemap.clone())); + errors::Handler::with_tty_emitter(ColorConfig::Auto, true, false, false, Some(codemap.clone())); let cstore = Rc::new(CStore::new(box rustc_trans::LlvmMetadataLoader)); let mut sess = session::build_session_( @@ -244,7 +244,7 @@ fn run_test(test: &str, cratename: &str, filename: &str, cfgs: Vec, libs let _bomb = Bomb(data.clone(), old.unwrap_or(box io::stdout())); // Compile the code - let diagnostic_handler = errors::Handler::with_emitter(true, false, box emitter); + let diagnostic_handler = errors::Handler::with_emitter(true, false, false, box emitter); let cstore = Rc::new(CStore::new(box rustc_trans::LlvmMetadataLoader)); let mut sess = session::build_session_( diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 951163d35fa..924183fd64e 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1726,7 +1726,7 @@ mod tests { Some(cm.clone()), false); ParseSess { - span_diagnostic: errors::Handler::with_emitter(true, false, Box::new(emitter)), + span_diagnostic: errors::Handler::with_emitter(true, false, false, Box::new(emitter)), unstable_features: UnstableFeatures::from_environment(), config: CrateConfig::new(), included_mod_stack: RefCell::new(Vec::new()), diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index c679efd41ea..11e4abdb350 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -58,6 +58,7 @@ impl ParseSess { let handler = Handler::with_tty_emitter(ColorConfig::Auto, true, false, + false, Some(cm.clone())); ParseSess::with_span_handler(handler, cm) } diff --git a/src/libsyntax/test_snippet.rs b/src/libsyntax/test_snippet.rs index a29250ea5f1..10ad440ca85 100644 --- a/src/libsyntax/test_snippet.rs +++ b/src/libsyntax/test_snippet.rs @@ -62,7 +62,7 @@ fn test_harness(file_text: &str, span_labels: Vec, expected_output: & let emitter = EmitterWriter::new(Box::new(Shared { data: output.clone() }), Some(code_map.clone()), false); - let handler = Handler::with_emitter(true, false, Box::new(emitter)); + let handler = Handler::with_emitter(true, false, false, Box::new(emitter)); handler.span_err(msp, "foo"); assert!(expected_output.chars().next() == Some('\n'), diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/src/test/ui/codemap_tests/bad-format-args.stderr index 258c0f228be..ba7e88103f5 100644 --- a/src/test/ui/codemap_tests/bad-format-args.stderr +++ b/src/test/ui/codemap_tests/bad-format-args.stderr @@ -4,7 +4,7 @@ error: requires at least a format string argument 12 | format!(); | ^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: expected token: `,` --> $DIR/bad-format-args.rs:13:5 @@ -12,7 +12,7 @@ error: expected token: `,` 13 | format!("" 1); | ^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: expected token: `,` --> $DIR/bad-format-args.rs:14:5 @@ -20,7 +20,7 @@ error: expected token: `,` 14 | format!("", 1 1); | ^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 3 previous errors diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/src/test/ui/codemap_tests/issue-28308.stderr index cecf9eab657..a065e06926b 100644 --- a/src/test/ui/codemap_tests/issue-28308.stderr +++ b/src/test/ui/codemap_tests/issue-28308.stderr @@ -4,7 +4,7 @@ error[E0600]: cannot apply unary operator `!` to type `&'static str` 12 | assert!("foo"); | ^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/cross-crate-macro-backtrace/main.stderr b/src/test/ui/cross-crate-macro-backtrace/main.stderr index 55395c4fc4b..a6e589160a5 100644 --- a/src/test/ui/cross-crate-macro-backtrace/main.stderr +++ b/src/test/ui/cross-crate-macro-backtrace/main.stderr @@ -4,7 +4,7 @@ error: 1 positional argument in format string, but no arguments were given 16 | myprintln!("{}"); //~ ERROR in this macro | ^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/fmt/format-string-error.stderr b/src/test/ui/fmt/format-string-error.stderr index 96f646a7fb1..9d45c84c03c 100644 --- a/src/test/ui/fmt/format-string-error.stderr +++ b/src/test/ui/fmt/format-string-error.stderr @@ -5,7 +5,7 @@ error: invalid format string: expected `'}'` but string was terminated | ^^^^^^^^^^^^^^ | = note: if you intended to print `{`, you can escape it using `{{` - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: invalid format string: unmatched `}` found --> $DIR/format-string-error.rs:14:5 @@ -14,7 +14,7 @@ error: invalid format string: unmatched `}` found | ^^^^^^^^^^^^^^ | = note: if you intended to print `}`, you can escape it using `}}` - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 2 previous errors diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr index bd717b1b6e5..70cde44e4c7 100644 --- a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr +++ b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr @@ -9,7 +9,7 @@ error[E0597]: borrowed value does not live long enough | - temporary value needs to live until here | = note: consider using a `let` binding to increase its lifetime - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/macro_backtrace/main.rs b/src/test/ui/macro_backtrace/main.rs index 4da0c586d60..443574073f8 100644 --- a/src/test/ui/macro_backtrace/main.rs +++ b/src/test/ui/macro_backtrace/main.rs @@ -10,7 +10,7 @@ // Test that the macro backtrace facility works // aux-build:ping.rs -// rustc-env:RUST_MACRO_BACKTRACE +// compile-flags: -Z macro-backtrace #[macro_use] extern crate ping; diff --git a/src/test/ui/macros/format-foreign.stderr b/src/test/ui/macros/format-foreign.stderr index f6412cae44a..4d82aa437fb 100644 --- a/src/test/ui/macros/format-foreign.stderr +++ b/src/test/ui/macros/format-foreign.stderr @@ -11,7 +11,7 @@ error: multiple unused formatting arguments = help: `%.*3$s` should be written as `{:.2$}` = help: `%s` should be written as `{}` = note: printf formatting not supported; see the documentation for `std::fmt` - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: argument never used --> $DIR/format-foreign.rs:13:29 diff --git a/src/test/ui/macros/format-unused-lables.stderr b/src/test/ui/macros/format-unused-lables.stderr index 33d9889d127..1169ec11d2a 100644 --- a/src/test/ui/macros/format-unused-lables.stderr +++ b/src/test/ui/macros/format-unused-lables.stderr @@ -8,7 +8,7 @@ error: multiple unused formatting arguments | | unused | unused | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: multiple unused formatting arguments --> $DIR/format-unused-lables.rs:14:5 @@ -23,7 +23,7 @@ error: multiple unused formatting arguments 18 | | ); | |______^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: named argument never used --> $DIR/format-unused-lables.rs:20:35 @@ -47,7 +47,7 @@ error: multiple unused formatting arguments | = help: `$STUFF` should be written as `{STUFF}` = note: shell formatting not supported; see the documentation for `std::fmt` - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 4 previous errors diff --git a/src/test/ui/reachable/expr_again.stderr b/src/test/ui/reachable/expr_again.stderr index fdc309ed999..ec659af008e 100644 --- a/src/test/ui/reachable/expr_again.stderr +++ b/src/test/ui/reachable/expr_again.stderr @@ -9,7 +9,7 @@ note: lint level defined here | 13 | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/reachable/expr_block.stderr b/src/test/ui/reachable/expr_block.stderr index 1c03c26609c..074d43d3b39 100644 --- a/src/test/ui/reachable/expr_block.stderr +++ b/src/test/ui/reachable/expr_block.stderr @@ -16,7 +16,7 @@ error: unreachable statement 36 | println!("foo"); | ^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 2 previous errors diff --git a/src/test/ui/reachable/expr_if.stderr b/src/test/ui/reachable/expr_if.stderr index bb5acd4b143..c3841a85100 100644 --- a/src/test/ui/reachable/expr_if.stderr +++ b/src/test/ui/reachable/expr_if.stderr @@ -9,7 +9,7 @@ note: lint level defined here | 14 | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/reachable/expr_loop.stderr b/src/test/ui/reachable/expr_loop.stderr index e1f1f9a5fb4..d9066a9ad93 100644 --- a/src/test/ui/reachable/expr_loop.stderr +++ b/src/test/ui/reachable/expr_loop.stderr @@ -9,7 +9,7 @@ note: lint level defined here | 14 | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: unreachable statement --> $DIR/expr_loop.rs:31:5 @@ -17,7 +17,7 @@ error: unreachable statement 31 | println!("I am dead."); | ^^^^^^^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: unreachable statement --> $DIR/expr_loop.rs:41:5 @@ -25,7 +25,7 @@ error: unreachable statement 41 | println!("I am dead."); | ^^^^^^^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 3 previous errors diff --git a/src/test/ui/reachable/expr_match.stderr b/src/test/ui/reachable/expr_match.stderr index 585d0367311..0580016070c 100644 --- a/src/test/ui/reachable/expr_match.stderr +++ b/src/test/ui/reachable/expr_match.stderr @@ -16,7 +16,7 @@ error: unreachable statement 25 | println!("I am dead"); | ^^^^^^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: unreachable statement --> $DIR/expr_match.rs:35:5 @@ -24,7 +24,7 @@ error: unreachable statement 35 | println!("I am dead"); | ^^^^^^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 3 previous errors diff --git a/src/test/ui/reachable/expr_while.stderr b/src/test/ui/reachable/expr_while.stderr index 87d1ac97712..98c6cb66d59 100644 --- a/src/test/ui/reachable/expr_while.stderr +++ b/src/test/ui/reachable/expr_while.stderr @@ -9,7 +9,7 @@ note: lint level defined here | 14 | #![deny(unreachable_code)] | ^^^^^^^^^^^^^^^^ - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: unreachable statement --> $DIR/expr_while.rs:33:9 @@ -17,7 +17,7 @@ error: unreachable statement 33 | println!("I am dead."); | ^^^^^^^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: unreachable statement --> $DIR/expr_while.rs:35:5 @@ -25,7 +25,7 @@ error: unreachable statement 35 | println!("I am, too."); | ^^^^^^^^^^^^^^^^^^^^^^^ | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 3 previous errors diff --git a/src/test/ui/span/coerce-suggestions.stderr b/src/test/ui/span/coerce-suggestions.stderr index 9a43a869b60..426f7b74624 100644 --- a/src/test/ui/span/coerce-suggestions.stderr +++ b/src/test/ui/span/coerce-suggestions.stderr @@ -56,7 +56,7 @@ error[E0308]: mismatched types = note: expected type `&mut std::string::String` found type `std::string::String` = help: try with `&mut format!("foo")` - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to 6 previous errors diff --git a/src/test/ui/span/issue-33884.stderr b/src/test/ui/span/issue-33884.stderr index 38515268c73..bee9b20099f 100644 --- a/src/test/ui/span/issue-33884.stderr +++ b/src/test/ui/span/issue-33884.stderr @@ -6,7 +6,7 @@ error[E0308]: mismatched types | = note: expected type `std::fmt::Arguments<'_>` found type `std::string::String` - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/span/issue-40157.stderr b/src/test/ui/span/issue-40157.stderr index 4826410de30..c7f8ebab476 100644 --- a/src/test/ui/span/issue-40157.stderr +++ b/src/test/ui/span/issue-40157.stderr @@ -8,7 +8,7 @@ error[E0597]: `foo` does not live long enough | | borrow occurs here | borrowed value needs to live until here | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/span/slice-borrow.stderr b/src/test/ui/span/slice-borrow.stderr index 679cba9f59c..dcfeb9fa16e 100644 --- a/src/test/ui/span/slice-borrow.stderr +++ b/src/test/ui/span/slice-borrow.stderr @@ -9,7 +9,7 @@ error[E0597]: borrowed value does not live long enough 19 | } | - temporary value needs to live until here | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec.stderr b/src/test/ui/type-check/cannot_infer_local_or_vec.stderr index 06550634cc8..5e11af14f1b 100644 --- a/src/test/ui/type-check/cannot_infer_local_or_vec.stderr +++ b/src/test/ui/type-check/cannot_infer_local_or_vec.stderr @@ -6,7 +6,7 @@ error[E0282]: type annotations needed | | | consider giving `x` a type | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error diff --git a/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr b/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr index 8ec68b6133a..a6936e9ea1f 100644 --- a/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr +++ b/src/test/ui/type-check/cannot_infer_local_or_vec_in_tuples.stderr @@ -6,7 +6,7 @@ error[E0282]: type annotations needed | | | consider giving the pattern a type | - = note: this error originates in a macro outside of the current crate (run with RUST_MACRO_BACKTRACE=1 for more info) + = note: this error originates in a macro outside of the current crate (run with -Z macro-backtrace for more info) error: aborting due to previous error