Skip to content

Commit 76b50ba

Browse files
RalfJungRalfJung
authored
Rollup merge of rust-lang#66911 - eddyb:nicer-rustc_regions, r=matthewjasper
rustc_mir: use nicer path printing for #[rustc_regions] NLL tests. Similar to rust-lang#66850, spotted while working on rust-lang#66907. r? @matthewjasper
2 parents e7ce47b + 84bad09 commit 76b50ba

24 files changed

+109
-319
lines changed

‎src/librustc_mir/borrow_check/nll/universal_regions.rs

+10-12
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,9 @@ impl<'tcx> UniversalRegions<'tcx> {
312312
match self.defining_ty {
313313
DefiningTy::Closure(def_id, substs) => {
314314
err.note(&format!(
315-
"defining type: {:?} with closure substs {:#?}",
316-
def_id,
317-
&substs[..]
315+
"defining type: {} with closure substs {:#?}",
316+
tcx.def_path_str_with_substs(def_id, substs),
317+
&substs[tcx.generics_of(def_id).parent_count..],
318318
));
319319

320320
// FIXME: It'd be nice to print the late-bound regions
@@ -332,9 +332,9 @@ impl<'tcx> UniversalRegions<'tcx> {
332332
}
333333
DefiningTy::Generator(def_id, substs, _) => {
334334
err.note(&format!(
335-
"defining type: {:?} with generator substs {:#?}",
336-
def_id,
337-
&substs[..]
335+
"defining type: {} with generator substs {:#?}",
336+
tcx.def_path_str_with_substs(def_id, substs),
337+
&substs[tcx.generics_of(def_id).parent_count..],
338338
));
339339

340340
// FIXME: As above, we'd like to print out the region
@@ -350,16 +350,14 @@ impl<'tcx> UniversalRegions<'tcx> {
350350
}
351351
DefiningTy::FnDef(def_id, substs) => {
352352
err.note(&format!(
353-
"defining type: {:?} with substs {:#?}",
354-
def_id,
355-
&substs[..]
353+
"defining type: {}",
354+
tcx.def_path_str_with_substs(def_id, substs),
356355
));
357356
}
358357
DefiningTy::Const(def_id, substs) => {
359358
err.note(&format!(
360-
"defining constant type: {:?} with substs {:#?}",
361-
def_id,
362-
&substs[..]
359+
"defining constant type: {}",
360+
tcx.def_path_str_with_substs(def_id, substs),
363361
));
364362
}
365363
}

‎src/test/ui/nll/closure-requirements/escape-argument-callee.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: No external requirements
44
LL | let mut closure = expect_sig(|p, y| *p = y);
55
| ^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:4 ~ escape_argument_callee[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: test::{{closure}}#0 with closure substs [
88
i16,
99
for<'r, 's, 't0> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) mut &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) i32)),
1010
]
@@ -30,7 +30,7 @@ LL | | deref(p);
3030
LL | | }
3131
| |_^
3232
|
33-
= note: defining type: DefId(0:3 ~ escape_argument_callee[317d]::test[0]) with substs []
33+
= note: defining type: test
3434

3535
error: aborting due to previous error
3636

‎src/test/ui/nll/closure-requirements/escape-argument.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: No external requirements
44
LL | let mut closure = expect_sig(|p, y| *p = y);
55
| ^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:4 ~ escape_argument[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: test::{{closure}}#0 with closure substs [
88
i16,
99
for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) mut &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32, &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32)),
1010
]
@@ -21,7 +21,7 @@ LL | | deref(p);
2121
LL | | }
2222
| |_^
2323
|
24-
= note: defining type: DefId(0:3 ~ escape_argument[317d]::test[0]) with substs []
24+
= note: defining type: test
2525

2626
error[E0597]: `y` does not live long enough
2727
--> $DIR/escape-argument.rs:27:25

‎src/test/ui/nll/closure-requirements/escape-upvar-nested.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | let mut closure1 = || p = &y;
55
| ^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:5 ~ escape_upvar_nested[317d]::test[0]::{{closure}}[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: test::{{closure}}#0::{{closure}}#0 with closure substs [
88
i16,
99
extern "rust-call" fn(()),
1010
&'_#1r i32,
@@ -23,7 +23,7 @@ LL | | closure1();
2323
LL | | };
2424
| |_________^
2525
|
26-
= note: defining type: DefId(0:4 ~ escape_upvar_nested[317d]::test[0]::{{closure}}[0]) with closure substs [
26+
= note: defining type: test::{{closure}}#0 with closure substs [
2727
i16,
2828
extern "rust-call" fn(()),
2929
&'_#1r i32,
@@ -44,7 +44,7 @@ LL | | deref(p);
4444
LL | | }
4545
| |_^
4646
|
47-
= note: defining type: DefId(0:3 ~ escape_upvar_nested[317d]::test[0]) with substs []
47+
= note: defining type: test
4848

4949
error[E0597]: `y` does not live long enough
5050
--> $DIR/escape-upvar-nested.rs:21:40

‎src/test/ui/nll/closure-requirements/escape-upvar-ref.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | let mut closure = || p = &y;
55
| ^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:4 ~ escape_upvar_ref[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: test::{{closure}}#0 with closure substs [
88
i16,
99
extern "rust-call" fn(()),
1010
&'_#1r i32,
@@ -25,7 +25,7 @@ LL | | deref(p);
2525
LL | | }
2626
| |_^
2727
|
28-
= note: defining type: DefId(0:3 ~ escape_upvar_ref[317d]::test[0]) with substs []
28+
= note: defining type: test
2929

3030
error[E0597]: `y` does not live long enough
3131
--> $DIR/escape-upvar-ref.rs:23:35

‎src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | | demand_y(x, y, p)
88
LL | | },
99
| |_________^
1010
|
11-
= note: defining type: DefId(0:18 ~ propagate_approximated_fail_no_postdom[317d]::supply[0]::{{closure}}[0]) with closure substs [
11+
= note: defining type: supply::{{closure}}#0 with closure substs [
1212
i16,
1313
for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#3r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
1414
]
@@ -39,7 +39,7 @@ LL | | );
3939
LL | | }
4040
| |_^
4141
|
42-
= note: defining type: DefId(0:14 ~ propagate_approximated_fail_no_postdom[317d]::supply[0]) with substs []
42+
= note: defining type: supply
4343

4444
error: aborting due to previous error
4545

‎src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | |
99
LL | | });
1010
| |_____^
1111
|
12-
= note: defining type: DefId(0:16 ~ propagate_approximated_ref[317d]::supply[0]::{{closure}}[0]) with closure substs [
12+
= note: defining type: supply::{{closure}}#0 with closure substs [
1313
i16,
1414
for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) &'_#2r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>)),
1515
]
@@ -30,7 +30,7 @@ LL | | });
3030
LL | | }
3131
| |_^
3232
|
33-
= note: defining type: DefId(0:13 ~ propagate_approximated_ref[317d]::supply[0]) with substs []
33+
= note: defining type: supply
3434

3535
error: lifetime may not live long enough
3636
--> $DIR/propagate-approximated-ref.rs:45:9

‎src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | |
88
LL | | })
99
| |_____^
1010
|
11-
= note: defining type: DefId(0:9 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]::{{closure}}[0]) with closure substs [
11+
= note: defining type: case1::{{closure}}#0 with closure substs [
1212
i32,
1313
for<'r> extern "rust-call" fn((std::cell::Cell<&'_#1r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>)),
1414
]
@@ -35,7 +35,7 @@ LL | | })
3535
LL | | }
3636
| |_^
3737
|
38-
= note: defining type: DefId(0:8 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]) with substs []
38+
= note: defining type: case1
3939

4040
note: External requirements
4141
--> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:35:15
@@ -46,7 +46,7 @@ LL | | cell_x.set(cell_a.get()); // forces 'a: 'x, implies 'a = 'static
4646
LL | | })
4747
| |_____^
4848
|
49-
= note: defining type: DefId(0:11 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]::{{closure}}[0]) with closure substs [
49+
= note: defining type: case2::{{closure}}#0 with closure substs [
5050
i32,
5151
for<'r> extern "rust-call" fn((std::cell::Cell<&'_#1r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>)),
5252
]
@@ -65,7 +65,7 @@ LL | | })
6565
LL | | }
6666
| |_^
6767
|
68-
= note: defining type: DefId(0:10 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]) with substs []
68+
= note: defining type: case2
6969

7070
error[E0597]: `a` does not live long enough
7171
--> $DIR/propagate-approximated-shorter-to-static-comparing-against-free.rs:30:26

‎src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | | demand_y(x, y, x.get())
1010
LL | | });
1111
| |_____^
1212
|
13-
= note: defining type: DefId(0:16 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
13+
= note: defining type: supply::{{closure}}#0 with closure substs [
1414
i16,
1515
for<'r, 's, 't0, 't1, 't2> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t1)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t2)) u32>)),
1616
]
@@ -31,7 +31,7 @@ LL | | });
3131
LL | | }
3232
| |_^
3333
|
34-
= note: defining type: DefId(0:13 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]) with substs []
34+
= note: defining type: supply
3535

3636
error[E0521]: borrowed data escapes outside of function
3737
--> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:32:5

‎src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | | demand_y(x, y, x.get())
1010
LL | | });
1111
| |_____^
1212
|
13-
= note: defining type: DefId(0:16 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
13+
= note: defining type: supply::{{closure}}#0 with closure substs [
1414
i16,
1515
for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>)),
1616
]
@@ -31,7 +31,7 @@ LL | | });
3131
LL | | }
3232
| |_^
3333
|
34-
= note: defining type: DefId(0:13 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]) with substs []
34+
= note: defining type: supply
3535

3636
error[E0521]: borrowed data escapes outside of function
3737
--> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:35:5

‎src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | |
99
LL | | });
1010
| |_____^
1111
|
12-
= note: defining type: DefId(0:16 ~ propagate_approximated_val[317d]::test[0]::{{closure}}[0]) with closure substs [
12+
= note: defining type: test::{{closure}}#0 with closure substs [
1313
i16,
1414
for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#2r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
1515
]
@@ -30,7 +30,7 @@ LL | | });
3030
LL | | }
3131
| |_^
3232
|
33-
= note: defining type: DefId(0:13 ~ propagate_approximated_val[317d]::test[0]) with substs []
33+
= note: defining type: test
3434

3535
error: lifetime may not live long enough
3636
--> $DIR/propagate-approximated-val.rs:38:9

‎src/test/ui/nll/closure-requirements/propagate-despite-same-free-region.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | | demand_y(x, y, p)
88
LL | | },
99
| |_________^
1010
|
11-
= note: defining type: DefId(0:14 ~ propagate_despite_same_free_region[317d]::supply[0]::{{closure}}[0]) with closure substs [
11+
= note: defining type: supply::{{closure}}#0 with closure substs [
1212
i16,
1313
for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#2r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
1414
]
@@ -28,5 +28,5 @@ LL | | );
2828
LL | | }
2929
| |_^
3030
|
31-
= note: defining type: DefId(0:12 ~ propagate_despite_same_free_region[317d]::supply[0]) with substs []
31+
= note: defining type: supply
3232

‎src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | |
99
LL | | });
1010
| |_____^
1111
|
12-
= note: defining type: DefId(0:16 ~ propagate_fail_to_approximate_longer_no_bounds[317d]::supply[0]::{{closure}}[0]) with closure substs [
12+
= note: defining type: supply::{{closure}}#0 with closure substs [
1313
i16,
1414
for<'r, 's, 't0, 't1, 't2> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#1r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>)),
1515
]
@@ -39,7 +39,7 @@ LL | | });
3939
LL | | }
4040
| |_^
4141
|
42-
= note: defining type: DefId(0:13 ~ propagate_fail_to_approximate_longer_no_bounds[317d]::supply[0]) with substs []
42+
= note: defining type: supply
4343

4444
error: aborting due to previous error
4545

‎src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | |
99
LL | | });
1010
| |_____^
1111
|
12-
= note: defining type: DefId(0:16 ~ propagate_fail_to_approximate_longer_wrong_bounds[317d]::supply[0]::{{closure}}[0]) with closure substs [
12+
= note: defining type: supply::{{closure}}#0 with closure substs [
1313
i16,
1414
for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) &'_#1r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) &'_#2r u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('s)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed('t3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed('t1)) u32>)),
1515
]
@@ -39,7 +39,7 @@ LL | | });
3939
LL | | }
4040
| |_^
4141
|
42-
= note: defining type: DefId(0:13 ~ propagate_fail_to_approximate_longer_wrong_bounds[317d]::supply[0]) with substs []
42+
= note: defining type: supply
4343

4444
error: aborting due to previous error
4545

‎src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr

+2-7
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ LL | | require(value);
1111
LL | | });
1212
| |_____^
1313
|
14-
= note: defining type: DefId(0:14 ~ propagate_from_trait_match[317d]::supply[0]::{{closure}}[0]) with closure substs [
15-
'_#1r,
16-
T,
14+
= note: defining type: supply::<'_#1r, T>::{{closure}}#0 with closure substs [
1715
i32,
1816
extern "rust-call" fn((T,)),
1917
]
@@ -32,10 +30,7 @@ LL | | });
3230
LL | | }
3331
| |_^
3432
|
35-
= note: defining type: DefId(0:11 ~ propagate_from_trait_match[317d]::supply[0]) with substs [
36-
'_#1r,
37-
T,
38-
]
33+
= note: defining type: supply::<'_#1r, T>
3934

4035
error[E0309]: the parameter type `T` may not live long enough
4136
--> $DIR/propagate-from-trait-match.rs:32:36

‎src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: No external requirements
44
LL | expect_sig(|a, b| b); // ought to return `a`
55
| ^^^^^^^^
66
|
7-
= note: defining type: DefId(0:4 ~ return_wrong_bound_region[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: test::{{closure}}#0 with closure substs [
88
i16,
99
for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed('r)) i32, &ReLateBound(DebruijnIndex(0), BrNamed('s)) i32)) -> &ReLateBound(DebruijnIndex(0), BrNamed('r)) i32,
1010
]
@@ -27,7 +27,7 @@ LL | |
2727
LL | | }
2828
| |_^
2929
|
30-
= note: defining type: DefId(0:3 ~ return_wrong_bound_region[317d]::test[0]) with substs []
30+
= note: defining type: test
3131

3232
error: aborting due to previous error
3333

0 commit comments

Comments
 (0)