nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-21 22:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #119129 - jyn514:verbose, r=compiler-errors,estebank

Browse Source 
rework `-Zverbose`

implements the changes described in https://github.com/rust-lang/compiler-team/issues/706

the first commit is only a name change from `-Zverbose` to `-Zverbose-internals` and does not change behavior. the second commit changes diagnostics.

possible follow up work:
- `ty::pretty` could print more info with `--verbose` than it does currently. `-Z verbose-internals` shows too much info in a way that's not helpful to users. michael had ideas about this i didn't fully understand: https://rust-lang.zulipchat.com/#narrow/stream/233931-t-compiler.2Fmajor-changes/topic/uplift.20some.20-Zverbose.20calls.20and.20rename.20to.E2.80.A6.20compiler-team.23706/near/408984200
- `--verbose` should imply `-Z write-long-types-to-disk=no`. the code in `ty_string_with_limit` should take `--verbose` into account (apparently this affects `Ty::sort_string`, i'm not familiar with this code). writing a file to disk should suggest passing `--verbose`.

r? `@compiler-errors` cc `@estebank`
This commit is contained in:
bors 2023-12-26 12:27:29 +00:00
commit 2fe50cd72c
69 changed files with 160 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_driver_impl/src/pretty.rs
View File

@ -146,7 +146,7 @@ impl<'a> pprust_ast::PpAnn for AstHygieneAnn<'a> {
}
pprust_ast::AnnNode::Crate(_) => {
s.s.hardbreak();
let verbose = self.sess.verbose();
let verbose = self.sess.verbose_internals();
s.synth_comment(rustc_span::hygiene::debug_hygiene_data(verbose));
s.s.hardbreak_if_not_bol();
}

4
compiler/rustc_hir_typeck/src/expr.rs
View File

@ -187,8 +187,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
expected: Expectation<'tcx>,
args: &'tcx [hir::Expr<'tcx>],
) -> Ty<'tcx> {
if self.tcx().sess.verbose() {
// make this code only run with -Zverbose because it is probably slow
if self.tcx().sess.verbose_internals() {
// make this code only run with -Zverbose-internals because it is probably slow
if let Ok(lint_str) = self.tcx.sess.source_map().span_to_snippet(expr.span) {
if !lint_str.contains('\n') {
debug!("expr text: {lint_str}");

42
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View File

@ -1212,6 +1212,23 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
s.push_highlighted(mutbl.prefix_str());
}
fn maybe_highlight<T: Eq + ToString>(
t1: T,
t2: T,
(buf1, buf2): &mut (DiagnosticStyledString, DiagnosticStyledString),
tcx: TyCtxt<'_>,
) {
let highlight = t1 != t2;
let (t1, t2) = if highlight || tcx.sess.opts.verbose {
(t1.to_string(), t2.to_string())
} else {
// The two types are the same, elide and don't highlight.
("_".into(), "_".into())
};
buf1.push(t1, highlight);
buf2.push(t2, highlight);
}
fn cmp_ty_refs<'tcx>(
r1: ty::Region<'tcx>,
mut1: hir::Mutability,
@ -1308,7 +1325,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
if lifetimes.0 != lifetimes.1 {
values.0.push_highlighted(l1);
values.1.push_highlighted(l2);
} else if lifetimes.0.is_bound() {
} else if lifetimes.0.is_bound() || self.tcx.sess.opts.verbose {
values.0.push_normal(l1);
values.1.push_normal(l2);
} else {
@ -1329,7 +1346,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
let num_display_types = consts_offset - regions_len;
for (i, (ta1, ta2)) in type_arguments.take(num_display_types).enumerate() {
let i = i + regions_len;
if ta1 == ta2 && !self.tcx.sess.verbose() {
if ta1 == ta2 && !self.tcx.sess.opts.verbose {
values.0.push_normal("_");
values.1.push_normal("_");
} else {
@ -1343,13 +1360,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
let const_arguments = sub1.consts().zip(sub2.consts());
for (i, (ca1, ca2)) in const_arguments.enumerate() {
let i = i + consts_offset;
if ca1 == ca2 && !self.tcx.sess.verbose() {
values.0.push_normal("_");
values.1.push_normal("_");
} else {
values.0.push_highlighted(ca1.to_string());
values.1.push_highlighted(ca2.to_string());
}
maybe_highlight(ca1, ca2, &mut values, self.tcx);
self.push_comma(&mut values.0, &mut values.1, len, i);
}
@ -1513,16 +1524,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
(ty::FnPtr(sig1), ty::FnPtr(sig2)) => self.cmp_fn_sig(sig1, sig2),
_ => {
if t1 == t2 && !self.tcx.sess.verbose() {
// The two types are the same, elide and don't highlight.
(DiagnosticStyledString::normal("_"), DiagnosticStyledString::normal("_"))
} else {
// We couldn't find anything in common, highlight everything.
(
DiagnosticStyledString::highlighted(t1.to_string()),
DiagnosticStyledString::highlighted(t2.to_string()),
)
}
let mut strs = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
maybe_highlight(t1, t2, &mut strs, self.tcx);
strs
}
}
}

2
compiler/rustc_infer/src/traits/structural_impls.rs
View File

@ -17,7 +17,7 @@ impl<'tcx, T: fmt::Debug> fmt::Debug for Normalized<'tcx, T> {
impl<'tcx, O: fmt::Debug> fmt::Debug for traits::Obligation<'tcx, O> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if ty::tls::with(|tcx| tcx.sess.verbose()) {
if ty::tls::with(|tcx| tcx.sess.verbose_internals()) {
write!(
f,
"Obligation(predicate={:?}, cause={:?}, param_env={:?}, depth={})",

2
compiler/rustc_interface/src/tests.rs
View File

@ -714,7 +714,7 @@ fn test_unstable_options_tracking_hash() {
untracked!(unpretty, Some("expanded".to_string()));
untracked!(unstable_options, true);
untracked!(validate_mir, true);
untracked!(verbose, true);
untracked!(verbose_internals, true);
untracked!(write_long_types_to_disk, false);
// tidy-alphabetical-end

16
compiler/rustc_middle/src/mir/pretty.rs
View File

@ -627,7 +627,11 @@ where
w,
"{:A$} // {}{}",
indented_body,
if tcx.sess.verbose() { format!("{current_location:?}: ") } else { String::new() },
if tcx.sess.verbose_internals() {
format!("{current_location:?}: ")
} else {
String::new()
},
comment(tcx, statement.source_info),
A = ALIGN,
)?;
@ -652,7 +656,11 @@ where
w,
"{:A$} // {}{}",
indented_terminator,
if tcx.sess.verbose() { format!("{current_location:?}: ") } else { String::new() },
if tcx.sess.verbose_internals() {
format!("{current_location:?}: ")
} else {
String::new()
},
comment(tcx, data.terminator().source_info),
A = ALIGN,
)?;
@ -943,7 +951,7 @@ impl<'tcx> Debug for Rvalue<'tcx> {
// When printing regions, add trailing space if necessary.
let print_region = ty::tls::with(|tcx| {
tcx.sess.verbose() || tcx.sess.opts.unstable_opts.identify_regions
tcx.sess.verbose_internals() || tcx.sess.opts.unstable_opts.identify_regions
});
let region = if print_region {
let mut region = region.to_string();
@ -1668,7 +1676,7 @@ fn pretty_print_const_value_tcx<'tcx>(
) -> fmt::Result {
use crate::ty::print::PrettyPrinter;
if tcx.sess.verbose() {
if tcx.sess.verbose_internals() {
fmt.write_str(&format!("ConstValue({ct:?}: {ty})"))?;
return Ok(());
}

2
compiler/rustc_middle/src/traits/mod.rs
View File

@ -177,7 +177,7 @@ impl<'tcx> ObligationCause<'tcx> {
// NOTE(flaper87): As of now, it keeps track of the whole error
// chain. Ideally, we should have a way to configure this either
// by using -Z verbose or just a CLI argument.
// by using -Z verbose-internals or just a CLI argument.
self.code =
variant(DerivedObligationCause { parent_trait_pred, parent_code: self.code }).into();
self

4
compiler/rustc_middle/src/ty/generics.rs
View File

@ -326,7 +326,7 @@ impl<'tcx> Generics {
own_params.start = 1;
}
let verbose = tcx.sess.verbose();
let verbose = tcx.sess.verbose_internals();
// Filter the default arguments.
//
@ -342,7 +342,7 @@ impl<'tcx> Generics {
param.default_value(tcx).is_some_and(|default| {
default.instantiate(tcx, args) == args[param.index as usize]
})
// filter out trailing effect params, if we're not in `-Zverbose`.
// filter out trailing effect params, if we're not in `-Zverbose-internals`.
|| (!verbose && matches!(param.kind, GenericParamDefKind::Const { is_host_effect: true, .. }))
})
.count();

6
compiler/rustc_middle/src/ty/print/pretty.rs
View File

@ -744,7 +744,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
// only affect certain debug messages (e.g. messages printed
// from `rustc_middle::ty` during the computation of `tcx.predicates_of`),
// and should have no effect on any compiler output.
// [Unless `-Zverbose` is used, e.g. in the output of
// [Unless `-Zverbose-internals` is used, e.g. in the output of
// `tests/ui/nll/ty-outlives/impl-trait-captures.rs`, for
// example.]
if self.should_print_verbose() {
@ -829,7 +829,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
}
ty::CoroutineWitness(did, args) => {
p!(write("{{"));
if !self.tcx().sess.verbose() {
if !self.tcx().sess.verbose_internals() {
p!("coroutine witness");
// FIXME(eddyb) should use `def_span`.
if let Some(did) = did.as_local() {
@ -1698,7 +1698,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
}
fn should_print_verbose(&self) -> bool {
self.tcx().sess.verbose()
self.tcx().sess.verbose_internals()
}
}

7
compiler/rustc_query_impl/src/plumbing.rs
View File

@ -315,8 +315,11 @@ pub(crate) fn create_query_frame<
ty::print::with_forced_impl_filename_line!(do_describe(tcx, key))
)
);
let description =
if tcx.sess.verbose() { format!("{description} [{name:?}]") } else { description };
let description = if tcx.sess.verbose_internals() {
format!("{description} [{name:?}]")
} else {
description
};
let span = if kind == dep_graph::dep_kinds::def_span || with_no_queries() {
// The `def_span` query is used to calculate `default_span`,
// so exit to avoid infinite recursion.

4
compiler/rustc_session/src/config.rs
View File

@ -1116,6 +1116,7 @@ impl Default for Options {
working_dir: RealFileName::LocalPath(std::env::current_dir().unwrap()),
color: ColorConfig::Auto,
logical_env: FxIndexMap::default(),
verbose: false,
}
}
}
@ -2916,6 +2917,8 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
RealFileName::LocalPath(path.into_owned())
};
let verbose = matches.opt_present("verbose") || unstable_opts.verbose_internals;
Options {
assert_incr_state,
crate_types,
@ -2957,6 +2960,7 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
working_dir,
color,
logical_env,
verbose,
}
}

6
compiler/rustc_session/src/options.rs
View File

@ -223,6 +223,8 @@ top_level_options!(
/// The (potentially remapped) working directory
working_dir: RealFileName [TRACKED],
color: ColorConfig [UNTRACKED],
verbose: bool [UNTRACKED],
}
);
@ -1991,8 +1993,8 @@ written to standard error output)"),
"use legacy .ctors section for initializers rather than .init_array"),
validate_mir: bool = (false, parse_bool, [UNTRACKED],
"validate MIR after each transformation"),
#[rustc_lint_opt_deny_field_access("use `Session::verbose` instead of this field")]
verbose: bool = (false, parse_bool, [UNTRACKED],
#[rustc_lint_opt_deny_field_access("use `Session::verbose_internals` instead of this field")]
verbose_internals: bool = (false, parse_bool, [UNTRACKED],
"in general, enable more debug printouts (default: no)"),
#[rustc_lint_opt_deny_field_access("use `Session::verify_llvm_ir` instead of this field")]
verify_llvm_ir: bool = (false, parse_bool, [TRACKED],

4
compiler/rustc_session/src/session.rs
View File

@ -665,8 +665,8 @@ impl Session {
// JUSTIFICATION: defn of the suggested wrapper fns
#[allow(rustc::bad_opt_access)]
impl Session {
pub fn verbose(&self) -> bool {
self.opts.unstable_opts.verbose
pub fn verbose_internals(&self) -> bool {
self.opts.unstable_opts.verbose_internals
}
pub fn print_llvm_stats(&self) -> bool {

4
compiler/rustc_symbol_mangling/src/legacy.rs
View File

@ -214,7 +214,7 @@ impl<'tcx> Printer<'tcx> for SymbolPrinter<'tcx> {
| ty::Coroutine(def_id, args, _) => self.print_def_path(def_id, args),
// The `pretty_print_type` formatting of array size depends on
// -Zverbose flag, so we cannot reuse it here.
// -Zverbose-internals flag, so we cannot reuse it here.
ty::Array(ty, size) => {
self.write_str("[")?;
self.print_type(ty)?;
@ -255,7 +255,7 @@ impl<'tcx> Printer<'tcx> for SymbolPrinter<'tcx> {
// only print integers
match (ct.kind(), ct.ty().kind()) {
(ty::ConstKind::Value(ty::ValTree::Leaf(scalar)), ty::Int(_) | ty::Uint(_)) => {
// The `pretty_print_const` formatting depends on -Zverbose
// The `pretty_print_const` formatting depends on -Zverbose-internals
// flag, so we cannot reuse it here.
let signed = matches!(ct.ty().kind(), ty::Int(_));
write!(

2
src/doc/rustc/src/command-line-arguments.md
View File

@ -343,7 +343,7 @@ _Note:_ The order of these lint level arguments is taken into account, see [lint
## `-Z`: set unstable options
This flag will allow you to set unstable options of rustc. In order to set multiple options,
the -Z flag can be used multiple times. For example: `rustc -Z verbose -Z time-passes`.
the -Z flag can be used multiple times. For example: `rustc -Z verbose-internals -Z time-passes`.
Specifying options with -Z is only available on nightly. To view all available options
run: `rustc -Z help`, or see [The Unstable Book](../unstable-book/index.html).

4
tests/mir-opt/nll/named_lifetimes_basic.rs
View File

@ -4,8 +4,8 @@
// suitable variables and that we setup the outlives relationship
// between R0 and R1 properly.
// compile-flags: -Zverbose
// ^^^^^^^^^ force compiler to dump more region information
// compile-flags: -Zverbose-internals
// ^^^^^^^^^^^^^^^^^^^ force compiler to dump more region information
#![allow(warnings)]

4
tests/mir-opt/nll/region_subtyping_basic.rs
View File

@ -3,8 +3,8 @@
// in the type of `p` includes the points after `&v[0]` up to (but not
// including) the call to `use_x`. The `else` branch is not included.
// compile-flags:-Zverbose
// ^^^^^^^^^ force compiler to dump more region information
// compile-flags:-Zverbose-internals
// ^^^^^^^^^^^^^^^^^^^ force compiler to dump more region information
#![allow(warnings)]

2
tests/ui/associated-types/substs-ppaux.rs
View File

@ -1,7 +1,7 @@
//
// revisions: verbose normal
//
//[verbose] compile-flags: -Z verbose
//[verbose] compile-flags: -Z verbose-internals
trait Foo<'b, 'c, S=u32> {
fn bar<'a, T>() where T: 'a {}

2
tests/ui/closures/print/closure-print-generic-trim-off-verbose-2.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Ztrim-diagnostic-paths=off -Zverbose
// compile-flags: -Ztrim-diagnostic-paths=off -Zverbose-internals
mod mod1 {
pub fn f<T: std::fmt::Display>(t: T)

2
tests/ui/closures/print/closure-print-generic-verbose-1.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
fn to_fn_once<F:FnOnce()>(f: F) -> F { f }

2
tests/ui/closures/print/closure-print-generic-verbose-2.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
mod mod1 {
pub fn f<T: std::fmt::Display>(t: T)

2
tests/ui/closures/print/closure-print-verbose.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
// Same as closure-coerce-fn-1.rs

2
tests/ui/coroutine/print/coroutine-print-verbose-1.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
// Same as: tests/ui/coroutine/issue-68112.stderr

2
tests/ui/coroutine/print/coroutine-print-verbose-2.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
// Same as test/ui/coroutine/not-send-sync.rs
#![feature(coroutines)]

2
tests/ui/coroutine/print/coroutine-print-verbose-3.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
#![feature(coroutines, coroutine_trait)]

2
tests/ui/fn/signature-error-reporting-under-verbose.rs
View File

@ -1,4 +1,4 @@
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
fn foo(_: i32, _: i32) {}

2
tests/ui/impl-trait/erased-regions-in-hidden-ty.rs
View File

@ -1,5 +1,5 @@
// revisions: current next
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
//[next] compile-flags: -Znext-solver
// normalize-stderr-test "DefId\([^\)]+\)" -> "DefId(..)"

2
tests/ui/issues/issue-13482-2.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Z verbose
// compile-flags:-Z verbose-internals
fn main() {
let x = [1,2];

2
tests/ui/nll/closure-requirements/escape-argument-callee.rs
View File

@ -12,7 +12,7 @@
// that appear free in its type (hence, we see it before the closure's
// "external requirements" report).
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/escape-argument.rs
View File

@ -12,7 +12,7 @@
// basically checking that the MIR type checker correctly enforces the
// closure signature.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/escape-upvar-nested.rs
View File

@ -5,7 +5,7 @@
//
// except that the closure does so via a second closure.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/escape-upvar-ref.rs
View File

@ -9,7 +9,7 @@
// `'b`. This relationship is propagated to the closure creator,
// which reports an error.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs
View File

@ -1,7 +1,7 @@
// Test where we fail to approximate due to demanding a postdom
// relationship between our upper bounds.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-approximated-ref.rs
View File

@ -12,7 +12,7 @@
// Note: the use of `Cell` here is to introduce invariance. One less
// variable.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.rs
View File

@ -2,7 +2,7 @@
// where `'x` is bound in closure type but `'a` is free. This forces
// us to approximate `'x` one way or the other.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs
View File

@ -3,7 +3,7 @@
// because `'y` is higher-ranked but we know of no relations to other
// regions. Note that `'static` shows up in the stderr output as `'0`.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs
View File

@ -4,7 +4,7 @@
// relations to other regions. Note that `'static` shows up in the
// stderr output as `'0`.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-approximated-val.rs
View File

@ -5,7 +5,7 @@
// relationships. In the 'main' variant, there are a number of
// anonymous regions as well.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-despite-same-free-region.rs
View File

@ -3,7 +3,7 @@
// need to propagate; but in fact we do because identity of free
// regions is erased.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
// check-pass
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.rs
View File

@ -7,7 +7,7 @@
// as it knows of no relationships between `'x` and any
// non-higher-ranked regions.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.rs
View File

@ -7,7 +7,7 @@
// as it only knows of regions that `'x` is outlived by, and none that
// `'x` outlives.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/closure-requirements/propagate-from-trait-match.rs
View File

@ -4,7 +4,7 @@
// the same `'a` for which it implements `Trait`, which can only be the `'a`
// from the function definition.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]
#![allow(dead_code)]

2
tests/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs
View File

@ -3,7 +3,7 @@
// a variety of errors from the older, AST-based machinery (notably
// borrowck), and then we get the NLL error at the end.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
fn foo(x: &u32) -> &'static u32 {
&*x

2
tests/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs
View File

@ -3,7 +3,7 @@
// a variety of errors from the older, AST-based machinery (notably
// borrowck), and then we get the NLL error at the end.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
fn foo<'a>(x: &'a u32) -> &'static u32 {
&*x

2
tests/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs
View File

@ -3,7 +3,7 @@
// a variety of errors from the older, AST-based machinery (notably
// borrowck), and then we get the NLL error at the end.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
fn foo<'a, 'b>(x: &'a u32, y: &'b u32) -> &'b u32 {
&*x

2
tests/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs
View File

@ -2,7 +2,7 @@
// report an error because of the (implied) bound that `'b: 'a`.
// check-pass
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
fn foo<'a, 'b>(x: &'a &'b u32) -> &'a u32 {
&**x

2
tests/ui/nll/closure-requirements/return-wrong-bound-region.rs
View File

@ -2,7 +2,7 @@
// the first, but actually returns the second. This should fail within
// the closure.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/nll/ty-outlives/impl-trait-captures.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]

2
tests/ui/nll/ty-outlives/impl-trait-outlives.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]

2
tests/ui/nll/ty-outlives/projection-implied-bounds.rs
View File

@ -1,7 +1,7 @@
// Test that we can deduce when projections like `T::Item` outlive the
// function body. Test that this does not imply that `T: 'a` holds.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
use std::cell::Cell;

2
tests/ui/nll/ty-outlives/projection-no-regions-closure.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
// Tests closures that propagate an outlives relationship to their
// creator where the subject is a projection with no regions (`<T as

2
tests/ui/nll/ty-outlives/projection-no-regions-fn.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]

2
tests/ui/nll/ty-outlives/projection-one-region-closure.rs
View File

@ -12,7 +12,7 @@
//
// Ensuring that both `T: 'a` and `'b: 'a` holds does work (`elements_outlive`).
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]
#![feature(rustc_attrs)]

2
tests/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.rs
View File

@ -4,7 +4,7 @@
// case, the best way to satisfy the trait bound is to show that `'b:
// 'a`, which can be done in various ways.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]
#![feature(rustc_attrs)]

2
tests/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.rs
View File

@ -2,7 +2,7 @@
// outlive `'static`. In this case, we don't get any errors, and in fact
// we don't even propagate constraints from the closures to the callers.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
// check-pass
#![allow(warnings)]

2
tests/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs
View File

@ -5,7 +5,7 @@
// the trait bound, and hence we propagate it to the caller as a type
// test.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]
#![feature(rustc_attrs)]

2
tests/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]
#![feature(rustc_attrs)]

2
tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]
#![feature(rustc_attrs)]

2
tests/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.rs
View File

@ -2,7 +2,7 @@
// `correct_region` for an explanation of how this test is setup; it's
// somewhat intricate.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]
#![feature(rustc_attrs)]

2
tests/ui/nll/ty-outlives/ty-param-implied-bounds.rs
View File

@ -1,4 +1,4 @@
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
// check-pass
// Test that we assume that universal types like `T` outlive the

2
tests/ui/nll/user-annotations/dump-adt-brace-struct.rs
View File

@ -1,7 +1,7 @@
// Unit test for the "user substitutions" that are annotated on each
// node.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![allow(warnings)]
#![feature(rustc_attrs)]

2
tests/ui/nll/user-annotations/dump-fn-method.rs
View File

@ -1,7 +1,7 @@
// Unit test for the "user substitutions" that are annotated on each
// node.
// compile-flags:-Zverbose
// compile-flags:-Zverbose-internals
#![feature(rustc_attrs)]

2
tests/ui/symbol-names/types.rs
View File

@ -1,7 +1,7 @@
// build-fail
// revisions: legacy verbose-legacy
// compile-flags: --crate-name=a -C symbol-mangling-version=legacy -Z unstable-options
//[verbose-legacy]compile-flags: -Zverbose
//[verbose-legacy]compile-flags: -Zverbose-internals
// normalize-stderr-test: "h[[:xdigit:]]{16}" -> "h[HASH]"
#![feature(never_type)]

4
tests/ui/symbol-names/verbose.rs
View File

@ -1,10 +1,10 @@
// Regression test for issue #57596, where -Zverbose flag unintentionally
// Regression test for issue #57596, where -Zverbose-internals flag unintentionally
// affected produced symbols making it impossible to link between crates
// with a different value of the flag (for symbols involving generic
// arguments equal to defaults of their respective parameters).
//
// build-pass
// compile-flags: -Zverbose
// compile-flags: -Zverbose-internals
pub fn error(msg: String) -> Box<dyn std::error::Error> {
msg.into()

4
tests/ui/type/issue-94187-verbose-type-name.rs
View File

@ -1,8 +1,8 @@
// Check to insure that the output of `std::any::type_name` does not change based on `-Zverbose`
// Ensure the output of `std::any::type_name` does not change based on `-Zverbose-internals`
// run-pass
// edition: 2018
// revisions: normal verbose
// [verbose]compile-flags:-Zverbose
// [verbose]compile-flags:-Zverbose-internals --verbose
use std::any::type_name;

14
tests/ui/type/verbose.normal.stderr Normal file
View File

@ -0,0 +1,14 @@
error[E0308]: mismatched types
--> $DIR/verbose.rs:7:28
|
LL | let _: Foo<u32, i32> = Foo::<i32, i32> { x: 0, y: 0 };
| ------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Foo<u32, i32>`, found `Foo<i32, i32>`
| |
| expected due to this
|
= note: expected struct `Foo<u32, _>`
found struct `Foo<i32, _>`
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0308`.

13
tests/ui/type/verbose.rs Normal file
View File

@ -0,0 +1,13 @@
// revisions:verbose normal
// [verbose]compile-flags:--verbose
#![crate_type = "lib"]
struct Foo<T, U> { x: T, y: U }
fn bar() {
let _: Foo<u32, i32> = Foo::<i32, i32> { x: 0, y: 0 };
//~^ ERROR mismatched types
//[verbose]~| NOTE expected struct `Foo<u32, i32>`
//[normal]~| NOTE expected struct `Foo<u32, _>`
//~| NOTE expected `Foo<u32, i32>`
//~| NOTE expected due to this
}

14
tests/ui/type/verbose.verbose.stderr Normal file
View File

@ -0,0 +1,14 @@
error[E0308]: mismatched types
--> $DIR/verbose.rs:7:28
|
LL | let _: Foo<u32, i32> = Foo::<i32, i32> { x: 0, y: 0 };
| ------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Foo<u32, i32>`, found `Foo<i32, i32>`
| |
| expected due to this
|
= note: expected struct `Foo<u32, i32>`
found struct `Foo<i32, i32>`
error: aborting due to 1 previous error
For more information about this error, try `rustc --explain E0308`.

2
tests/ui/where-clauses/higher-ranked-fn-type.rs
View File

@ -1,5 +1,5 @@
// revisions: quiet verbose
// [verbose]compile-flags: -Zverbose
// [verbose]compile-flags: -Zverbose-internals
#![allow(unused_parens)]