Skip to content

Commit cb6d033

Browse files
jyn514jyn514
committed
don't elide shared parts of types in diagnostics when --verbose is passed
this also changes some parts of lifetime printing, which previously were not gated behind `-Z verbose`
1 parent b5d8361 commit cb6d033

File tree

8 files changed

+72
-21
lines changed

8 files changed

+72
-21
lines changed

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+23-19
Original file line numberDiff line numberDiff line change
@@ -1206,6 +1206,23 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
12061206
s.push_highlighted(mutbl.prefix_str());
12071207
}
12081208

1209+
fn maybe_highlight<T: Eq + ToString>(
1210+
t1: T,
1211+
t2: T,
1212+
(buf1, buf2): &mut (DiagnosticStyledString, DiagnosticStyledString),
1213+
tcx: TyCtxt<'_>,
1214+
) {
1215+
let highlight = t1 != t2;
1216+
let (t1, t2) = if highlight || tcx.sess.opts.verbose {
1217+
(t1.to_string(), t2.to_string())
1218+
} else {
1219+
// The two types are the same, elide and don't highlight.
1220+
("_".into(), "_".into())
1221+
};
1222+
buf1.push(t1, highlight);
1223+
buf2.push(t2, highlight);
1224+
}
1225+
12091226
fn cmp_ty_refs<'tcx>(
12101227
r1: ty::Region<'tcx>,
12111228
mut1: hir::Mutability,
@@ -1302,7 +1319,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
13021319
if lifetimes.0 != lifetimes.1 {
13031320
values.0.push_highlighted(l1);
13041321
values.1.push_highlighted(l2);
1305-
} else if lifetimes.0.is_bound() {
1322+
} else if lifetimes.0.is_bound() || self.tcx.sess.opts.verbose {
13061323
values.0.push_normal(l1);
13071324
values.1.push_normal(l2);
13081325
} else {
@@ -1323,7 +1340,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
13231340
let num_display_types = consts_offset - regions_len;
13241341
for (i, (ta1, ta2)) in type_arguments.take(num_display_types).enumerate() {
13251342
let i = i + regions_len;
1326-
if ta1 == ta2 && !self.tcx.sess.verbose_internals() {
1343+
if ta1 == ta2 && !self.tcx.sess.opts.verbose {
13271344
values.0.push_normal("_");
13281345
values.1.push_normal("_");
13291346
} else {
@@ -1337,13 +1354,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
13371354
let const_arguments = sub1.consts().zip(sub2.consts());
13381355
for (i, (ca1, ca2)) in const_arguments.enumerate() {
13391356
let i = i + consts_offset;
1340-
if ca1 == ca2 && !self.tcx.sess.verbose_internals() {
1341-
values.0.push_normal("_");
1342-
values.1.push_normal("_");
1343-
} else {
1344-
values.0.push_highlighted(ca1.to_string());
1345-
values.1.push_highlighted(ca2.to_string());
1346-
}
1357+
maybe_highlight(ca1, ca2, &mut values, self.tcx);
13471358
self.push_comma(&mut values.0, &mut values.1, len, i);
13481359
}
13491360

@@ -1507,16 +1518,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
15071518
(ty::FnPtr(sig1), ty::FnPtr(sig2)) => self.cmp_fn_sig(sig1, sig2),
15081519

15091520
_ => {
1510-
if t1 == t2 && !self.tcx.sess.verbose_internals() {
1511-
// The two types are the same, elide and don't highlight.
1512-
(DiagnosticStyledString::normal("_"), DiagnosticStyledString::normal("_"))
1513-
} else {
1514-
// We couldn't find anything in common, highlight everything.
1515-
(
1516-
DiagnosticStyledString::highlighted(t1.to_string()),
1517-
DiagnosticStyledString::highlighted(t2.to_string()),
1518-
)
1519-
}
1521+
let mut strs = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
1522+
maybe_highlight(t1, t2, &mut strs, self.tcx);
1523+
strs
15201524
}
15211525
}
15221526
}

‎compiler/rustc_session/src/config.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1116,6 +1116,7 @@ impl Default for Options {
11161116
working_dir: RealFileName::LocalPath(std::env::current_dir().unwrap()),
11171117
color: ColorConfig::Auto,
11181118
logical_env: FxIndexMap::default(),
1119+
verbose: false,
11191120
}
11201121
}
11211122
}
@@ -2916,6 +2917,8 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
29162917
RealFileName::LocalPath(path.into_owned())
29172918
};
29182919

2920+
let verbose = matches.opt_present("verbose") || unstable_opts.verbose_internals;
2921+
29192922
Options {
29202923
assert_incr_state,
29212924
crate_types,
@@ -2957,6 +2960,7 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
29572960
working_dir,
29582961
color,
29592962
logical_env,
2963+
verbose,
29602964
}
29612965
}
29622966

‎compiler/rustc_session/src/options.rs

+2
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ top_level_options!(
223223
/// The (potentially remapped) working directory
224224
working_dir: RealFileName [TRACKED],
225225
color: ColorConfig [UNTRACKED],
226+
227+
verbose: bool [UNTRACKED],
226228
}
227229
);
228230

‎tests/mir-opt/nll/named_lifetimes_basic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// between R0 and R1 properly.
66

77
// compile-flags: -Zverbose-internals
8-
// ^^^^^^^^^ force compiler to dump more region information
8+
// ^^^^^^^^^^^^^^^^^^^ force compiler to dump more region information
99

1010
#![allow(warnings)]
1111

‎tests/mir-opt/nll/region_subtyping_basic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// including) the call to `use_x`. The `else` branch is not included.
55

66
// compile-flags:-Zverbose-internals
7-
// ^^^^^^^^^ force compiler to dump more region information
7+
// ^^^^^^^^^^^^^^^^^^^ force compiler to dump more region information
88

99
#![allow(warnings)]
1010

‎tests/ui/type/verbose.normal.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error[E0308]: mismatched types
2+
--> $DIR/verbose.rs:7:28
3+
|
4+
LL | let _: Foo<u32, i32> = Foo::<i32, i32> { x: 0, y: 0 };
5+
| ------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Foo<u32, i32>`, found `Foo<i32, i32>`
6+
| |
7+
| expected due to this
8+
|
9+
= note: expected struct `Foo<u32, _>`
10+
found struct `Foo<i32, _>`
11+
12+
error: aborting due to 1 previous error
13+
14+
For more information about this error, try `rustc --explain E0308`.

‎tests/ui/type/verbose.rs

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// revisions:verbose normal
2+
// [verbose]compile-flags:--verbose
3+
#![crate_type = "lib"]
4+
5+
struct Foo<T, U> { x: T, y: U }
6+
fn bar() {
7+
let _: Foo<u32, i32> = Foo::<i32, i32> { x: 0, y: 0 };
8+
//~^ ERROR mismatched types
9+
//[verbose]~| NOTE expected struct `Foo<u32, i32>`
10+
//[normal]~| NOTE expected struct `Foo<u32, _>`
11+
//~| NOTE expected `Foo<u32, i32>`
12+
//~| NOTE expected due to this
13+
}

‎tests/ui/type/verbose.verbose.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error[E0308]: mismatched types
2+
--> $DIR/verbose.rs:7:28
3+
|
4+
LL | let _: Foo<u32, i32> = Foo::<i32, i32> { x: 0, y: 0 };
5+
| ------------- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Foo<u32, i32>`, found `Foo<i32, i32>`
6+
| |
7+
| expected due to this
8+
|
9+
= note: expected struct `Foo<u32, i32>`
10+
found struct `Foo<i32, i32>`
11+
12+
error: aborting due to 1 previous error
13+
14+
For more information about this error, try `rustc --explain E0308`.

0 commit comments

Comments
 (0)