Skip to content

Commit 35a5ffc

Browse files
CentrilCentril
authoredNov 6, 2019
Rollup merge of #66115 - eddyb:global-meta-what, r=michaelwoerister
rustc: remove "GlobalMetaData" dead code from hir::map::definitions. Spotted while refactoring uses of `DefIndex` and/or `LocalDefId`. r? @michaelwoerister
·
1.87.01.41.0
2 parents f221c3d + 2595332 commit 35a5ffc

29 files changed

+116
-201
lines changed
 

‎src/librustc/hir/map/definitions.rs

Lines changed: 3 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::hash::Hash;
1919
use syntax::ast;
2020
use syntax_pos::symbol::{Symbol, sym};
2121
use syntax_pos::hygiene::ExpnId;
22-
use syntax_pos::{Span, DUMMY_SP};
22+
use syntax_pos::Span;
2323

2424
/// The `DefPathTable` maps `DefIndex`es to `DefKey`s and vice versa.
2525
/// Internally the `DefPathTable` holds a tree of `DefKey`s, where each `DefKey`
@@ -310,10 +310,6 @@ pub enum DefPathData {
310310
AnonConst,
311311
/// An `impl Trait` type node.
312312
ImplTrait,
313-
/// Identifies a piece of crate metadata that is global to a whole crate
314-
/// (as opposed to just one item). `GlobalMetaData` components are only
315-
/// supposed to show up right below the crate root.
316-
GlobalMetaData(Symbol),
317313
}
318314

319315
#[derive(Copy, Clone, Hash, PartialEq, Eq, PartialOrd, Ord, Debug,
@@ -444,9 +440,6 @@ impl Definitions {
444440
self.node_to_def_index.insert(ast::CRATE_NODE_ID, root_index);
445441
self.set_invocation_parent(ExpnId::root(), root_index);
446442

447-
// Allocate some other `DefIndex`es that always must exist.
448-
GlobalMetaDataKind::allocate_def_indices(self);
449-
450443
root_index
451444
}
452445

@@ -553,8 +546,7 @@ impl DefPathData {
553546
TypeNs(name) |
554547
ValueNs(name) |
555548
MacroNs(name) |
556-
LifetimeNs(name) |
557-
GlobalMetaData(name) => Some(name),
549+
LifetimeNs(name) => Some(name),
558550

559551
Impl |
560552
CrateRoot |
@@ -572,8 +564,7 @@ impl DefPathData {
572564
TypeNs(name) |
573565
ValueNs(name) |
574566
MacroNs(name) |
575-
LifetimeNs(name) |
576-
GlobalMetaData(name) => {
567+
LifetimeNs(name) => {
577568
name
578569
}
579570
// Note that this does not show up in user print-outs.
@@ -591,78 +582,3 @@ impl DefPathData {
591582
self.as_symbol().to_string()
592583
}
593584
}
594-
595-
// We define the `GlobalMetaDataKind` enum with this macro because we want to
596-
// make sure that we exhaustively iterate over all variants when registering
597-
// the corresponding `DefIndex`es in the `DefTable`.
598-
macro_rules! define_global_metadata_kind {
599-
(pub enum GlobalMetaDataKind {
600-
$($variant:ident),*
601-
}) => (
602-
pub enum GlobalMetaDataKind {
603-
$($variant),*
604-
}
605-
606-
impl GlobalMetaDataKind {
607-
fn allocate_def_indices(definitions: &mut Definitions) {
608-
$({
609-
let instance = GlobalMetaDataKind::$variant;
610-
definitions.create_def_with_parent(
611-
CRATE_DEF_INDEX,
612-
ast::DUMMY_NODE_ID,
613-
DefPathData::GlobalMetaData(instance.name()),
614-
ExpnId::root(),
615-
DUMMY_SP
616-
);
617-
618-
// Make sure calling `def_index` does not crash.
619-
instance.def_index(&definitions.table);
620-
})*
621-
}
622-
623-
pub fn def_index(&self, def_path_table: &DefPathTable) -> DefIndex {
624-
let def_key = DefKey {
625-
parent: Some(CRATE_DEF_INDEX),
626-
disambiguated_data: DisambiguatedDefPathData {
627-
data: DefPathData::GlobalMetaData(self.name()),
628-
disambiguator: 0,
629-
}
630-
};
631-
632-
// These `DefKey`s are all right after the root,
633-
// so a linear search is fine.
634-
let index = def_path_table.index_to_key
635-
.iter()
636-
.position(|k| *k == def_key)
637-
.unwrap();
638-
639-
DefIndex::from(index)
640-
}
641-
642-
fn name(&self) -> Symbol {
643-
644-
let string = match *self {
645-
$(
646-
GlobalMetaDataKind::$variant => {
647-
concat!("{{GlobalMetaData::", stringify!($variant), "}}")
648-
}
649-
)*
650-
};
651-
652-
Symbol::intern(string)
653-
}
654-
}
655-
)
656-
}
657-
658-
define_global_metadata_kind!(pub enum GlobalMetaDataKind {
659-
Krate,
660-
CrateDeps,
661-
DylibDependencyFormats,
662-
LangItems,
663-
LangItemsMissing,
664-
NativeLibraries,
665-
SourceMap,
666-
Impls,
667-
ExportedSymbols
668-
});

‎src/librustc_codegen_utils/symbol_names/v0.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,8 +601,7 @@ impl Printer<'tcx> for SymbolMangler<'tcx> {
601601
| DefPathData::Misc
602602
| DefPathData::Impl
603603
| DefPathData::MacroNs(_)
604-
| DefPathData::LifetimeNs(_)
605-
| DefPathData::GlobalMetaData(_) => {
604+
| DefPathData::LifetimeNs(_) => {
606605
bug!("symbol_names: unexpected DefPathData: {:?}", disambiguated_data.data)
607606
}
608607
};

‎src/test/mir-opt/graphviz.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ fn main() {}
77

88
// END RUST SOURCE
99
// START rustc.main.mir_map.0.dot
10-
// digraph Mir_0_12 { // The name here MUST be an ASCII identifier.
10+
// digraph Mir_0_3 { // The name here MUST be an ASCII identifier.
1111
// graph [fontname="monospace"];
1212
// node [fontname="monospace"];
1313
// edge [fontname="monospace"];
1414
// label=<fn main() -&gt; ()<br align="left"/>>;
15-
// bb0__0_12 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">0</td></tr><tr><td align="left" balign="left">_0 = ()<br/></td></tr><tr><td align="left">goto</td></tr></table>>];
16-
// bb1__0_12 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">1</td></tr><tr><td align="left">resume</td></tr></table>>];
17-
// bb2__0_12 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">2</td></tr><tr><td align="left">return</td></tr></table>>];
18-
// bb0__0_12 -> bb2__0_12 [label=""];
15+
// bb0__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">0</td></tr><tr><td align="left" balign="left">_0 = ()<br/></td></tr><tr><td align="left">goto</td></tr></table>>];
16+
// bb1__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">1</td></tr><tr><td align="left">resume</td></tr></table>>];
17+
// bb2__0_3 [shape="none", label=<<table border="0" cellborder="1" cellspacing="0"><tr><td bgcolor="gray" align="center" colspan="1">2</td></tr><tr><td align="left">return</td></tr></table>>];
18+
// bb0__0_3 -> bb2__0_3 [label=""];
1919
// }
2020
// END rustc.main.mir_map.0.dot

‎src/test/mir-opt/inline-closure-borrows-arg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn foo<T: Copy>(_t: T, q: &i32) -> i32 {
2020
// ...
2121
// bb0: {
2222
// ...
23-
// _3 = [closure@HirId { owner: DefIndex(13), local_id: 31 }];
23+
// _3 = [closure@HirId { owner: DefIndex(4), local_id: 31 }];
2424
// ...
2525
// _4 = &_3;
2626
// ...

‎src/test/mir-opt/inline-closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn foo<T: Copy>(_t: T, q: i32) -> i32 {
1616
// ...
1717
// bb0: {
1818
// ...
19-
// _3 = [closure@HirId { owner: DefIndex(13), local_id: 15 }];
19+
// _3 = [closure@HirId { owner: DefIndex(4), local_id: 15 }];
2020
// ...
2121
// _4 = &_3;
2222
// ...

‎src/test/mir-opt/retag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fn main() {
100100
// }
101101
// END rustc.main.EraseRegions.after.mir
102102
// START rustc.main-{{closure}}.EraseRegions.after.mir
103-
// fn main::{{closure}}#0(_1: &[closure@HirId { owner: DefIndex(22), local_id: 72 }], _2: &i32) -> &i32 {
103+
// fn main::{{closure}}#0(_1: &[closure@HirId { owner: DefIndex(13), local_id: 72 }], _2: &i32) -> &i32 {
104104
// ...
105105
// bb0: {
106106
// Retag([fn entry] _1);

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

Lines changed: 2 additions & 2 deletions
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:13 ~ escape_argument_callee[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:4 ~ escape_argument_callee[317d]::test[0]::{{closure}}[0]) with closure substs [
88
i16,
99
for<'r, 's, 't0> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) mut &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) i32)),
1010
]
@@ -30,7 +30,7 @@ LL | | deref(p);
3030
LL | | }
3131
| |_^
3232
|
33-
= note: defining type: DefId(0:12 ~ escape_argument_callee[317d]::test[0]) with substs []
33+
= note: defining type: DefId(0:3 ~ escape_argument_callee[317d]::test[0]) with substs []
3434

3535
error: aborting due to previous error
3636

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

Lines changed: 2 additions & 2 deletions
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:13 ~ escape_argument[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:4 ~ escape_argument[317d]::test[0]::{{closure}}[0]) with closure substs [
88
i16,
99
for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) mut &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32)),
1010
]
@@ -21,7 +21,7 @@ LL | | deref(p);
2121
LL | | }
2222
| |_^
2323
|
24-
= note: defining type: DefId(0:12 ~ escape_argument[317d]::test[0]) with substs []
24+
= note: defining type: DefId(0:3 ~ escape_argument[317d]::test[0]) with substs []
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

Lines changed: 3 additions & 3 deletions
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:14 ~ escape_upvar_nested[317d]::test[0]::{{closure}}[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:5 ~ escape_upvar_nested[317d]::test[0]::{{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:13 ~ escape_upvar_nested[317d]::test[0]::{{closure}}[0]) with closure substs [
26+
= note: defining type: DefId(0:4 ~ escape_upvar_nested[317d]::test[0]::{{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:12 ~ escape_upvar_nested[317d]::test[0]) with substs []
47+
= note: defining type: DefId(0:3 ~ escape_upvar_nested[317d]::test[0]) with substs []
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

Lines changed: 2 additions & 2 deletions
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:13 ~ escape_upvar_ref[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:4 ~ escape_upvar_ref[317d]::test[0]::{{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:12 ~ escape_upvar_ref[317d]::test[0]) with substs []
28+
= note: defining type: DefId(0:3 ~ escape_upvar_ref[317d]::test[0]) with substs []
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

Lines changed: 2 additions & 2 deletions
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:27 ~ propagate_approximated_fail_no_postdom[317d]::supply[0]::{{closure}}[0]) with closure substs [
11+
= note: defining type: DefId(0:18 ~ propagate_approximated_fail_no_postdom[317d]::supply[0]::{{closure}}[0]) with closure substs [
1212
i16,
1313
for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) &'_#3r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>)),
1414
]
@@ -39,7 +39,7 @@ LL | | );
3939
LL | | }
4040
| |_^
4141
|
42-
= note: defining type: DefId(0:23 ~ propagate_approximated_fail_no_postdom[317d]::supply[0]) with substs []
42+
= note: defining type: DefId(0:14 ~ propagate_approximated_fail_no_postdom[317d]::supply[0]) with substs []
4343

4444
error: aborting due to previous error
4545

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | |
88
LL | | })
99
| |_____^
1010
|
11-
= note: defining type: DefId(0:18 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]::{{closure}}[0]) with closure substs [
11+
= note: defining type: DefId(0:9 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]::{{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(crate0:DefIndex(0), 'r)) u32>)),
1414
]
@@ -35,7 +35,7 @@ LL | | })
3535
LL | | }
3636
| |_^
3737
|
38-
= note: defining type: DefId(0:17 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]) with substs []
38+
= note: defining type: DefId(0:8 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case1[0]) with substs []
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:20 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]::{{closure}}[0]) with closure substs [
49+
= note: defining type: DefId(0:11 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]::{{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(crate0:DefIndex(0), 'r)) u32>)),
5252
]
@@ -65,7 +65,7 @@ LL | | })
6565
LL | | }
6666
| |_^
6767
|
68-
= note: defining type: DefId(0:19 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]) with substs []
68+
= note: defining type: DefId(0:10 ~ propagate_approximated_shorter_to_static_comparing_against_free[317d]::case2[0]) with substs []
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

Lines changed: 2 additions & 2 deletions
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:25 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
13+
= note: defining type: DefId(0:16 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
1414
i16,
1515
for<'r, 's, 't0, 't1, 't2> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't2)) u32>)),
1616
]
@@ -31,7 +31,7 @@ LL | | });
3131
LL | | }
3232
| |_^
3333
|
34-
= note: defining type: DefId(0:22 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]) with substs []
34+
= note: defining type: DefId(0:13 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]) with substs []
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

Lines changed: 2 additions & 2 deletions
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:25 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
13+
= note: defining type: DefId(0:16 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]::{{closure}}[0]) with closure substs [
1414
i16,
1515
for<'r, 's, 't0, 't1, 't2, 't3> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't0)) std::cell::Cell<&'_#2r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't2)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't3)) std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 't1)) u32>)),
1616
]
@@ -31,7 +31,7 @@ LL | | });
3131
LL | | }
3232
| |_^
3333
|
34-
= note: defining type: DefId(0:22 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]) with substs []
34+
= note: defining type: DefId(0:13 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]) with substs []
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

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

Lines changed: 2 additions & 2 deletions
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:23 ~ propagate_despite_same_free_region[317d]::supply[0]::{{closure}}[0]) with closure substs [
11+
= note: defining type: DefId(0:14 ~ propagate_despite_same_free_region[317d]::supply[0]::{{closure}}[0]) with closure substs [
1212
i16,
1313
for<'r, 's> extern "rust-call" fn((std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) &'_#2r u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) u32>, std::cell::Cell<&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) u32>)),
1414
]
@@ -28,5 +28,5 @@ LL | | );
2828
LL | | }
2929
| |_^
3030
|
31-
= note: defining type: DefId(0:21 ~ propagate_despite_same_free_region[317d]::supply[0]) with substs []
31+
= note: defining type: DefId(0:12 ~ propagate_despite_same_free_region[317d]::supply[0]) with substs []
3232

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

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

4444
error: aborting due to previous error
4545

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

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

4444
error: aborting due to previous error
4545

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | | require(value);
1111
LL | | });
1212
| |_____^
1313
|
14-
= note: defining type: DefId(0:23 ~ propagate_from_trait_match[317d]::supply[0]::{{closure}}[0]) with closure substs [
14+
= note: defining type: DefId(0:14 ~ propagate_from_trait_match[317d]::supply[0]::{{closure}}[0]) with closure substs [
1515
'_#1r,
1616
T,
1717
i32,
@@ -32,7 +32,7 @@ LL | | });
3232
LL | | }
3333
| |_^
3434
|
35-
= note: defining type: DefId(0:20 ~ propagate_from_trait_match[317d]::supply[0]) with substs [
35+
= note: defining type: DefId(0:11 ~ propagate_from_trait_match[317d]::supply[0]) with substs [
3636
'_#1r,
3737
T,
3838
]

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

Lines changed: 2 additions & 2 deletions
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:13 ~ return_wrong_bound_region[317d]::test[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:4 ~ return_wrong_bound_region[317d]::test[0]::{{closure}}[0]) with closure substs [
88
i16,
99
for<'r, 's> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) i32, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) i32)) -> &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) i32,
1010
]
@@ -27,7 +27,7 @@ LL | |
2727
LL | | }
2828
| |_^
2929
|
30-
= note: defining type: DefId(0:12 ~ return_wrong_bound_region[317d]::test[0]) with substs []
30+
= note: defining type: DefId(0:3 ~ return_wrong_bound_region[317d]::test[0]) with substs []
3131

3232
error: aborting due to previous error
3333

‎src/test/ui/nll/ty-outlives/projection-no-regions-closure.stderr

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | with_signature(x, |mut y| Box::new(y.next()))
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:22 ~ projection_no_regions_closure[317d]::no_region[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:13 ~ projection_no_regions_closure[317d]::no_region[0]::{{closure}}[0]) with closure substs [
88
'_#1r,
99
T,
1010
i32,
@@ -25,7 +25,7 @@ LL | |
2525
LL | | }
2626
| |_^
2727
|
28-
= note: defining type: DefId(0:19 ~ projection_no_regions_closure[317d]::no_region[0]) with substs [
28+
= note: defining type: DefId(0:10 ~ projection_no_regions_closure[317d]::no_region[0]) with substs [
2929
'_#1r,
3030
T,
3131
]
@@ -44,7 +44,7 @@ note: External requirements
4444
LL | with_signature(x, |mut y| Box::new(y.next()))
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
4646
|
47-
= note: defining type: DefId(0:26 ~ projection_no_regions_closure[317d]::correct_region[0]::{{closure}}[0]) with closure substs [
47+
= note: defining type: DefId(0:17 ~ projection_no_regions_closure[317d]::correct_region[0]::{{closure}}[0]) with closure substs [
4848
'_#1r,
4949
T,
5050
i32,
@@ -64,7 +64,7 @@ LL | | with_signature(x, |mut y| Box::new(y.next()))
6464
LL | | }
6565
| |_^
6666
|
67-
= note: defining type: DefId(0:23 ~ projection_no_regions_closure[317d]::correct_region[0]) with substs [
67+
= note: defining type: DefId(0:14 ~ projection_no_regions_closure[317d]::correct_region[0]) with substs [
6868
'_#1r,
6969
T,
7070
]
@@ -75,7 +75,7 @@ note: External requirements
7575
LL | with_signature(x, |mut y| Box::new(y.next()))
7676
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
7777
|
78-
= note: defining type: DefId(0:31 ~ projection_no_regions_closure[317d]::wrong_region[0]::{{closure}}[0]) with closure substs [
78+
= note: defining type: DefId(0:22 ~ projection_no_regions_closure[317d]::wrong_region[0]::{{closure}}[0]) with closure substs [
7979
'_#1r,
8080
'_#2r,
8181
T,
@@ -97,7 +97,7 @@ LL | |
9797
LL | | }
9898
| |_^
9999
|
100-
= note: defining type: DefId(0:27 ~ projection_no_regions_closure[317d]::wrong_region[0]) with substs [
100+
= note: defining type: DefId(0:18 ~ projection_no_regions_closure[317d]::wrong_region[0]) with substs [
101101
'_#1r,
102102
'_#2r,
103103
T,
@@ -117,7 +117,7 @@ note: External requirements
117117
LL | with_signature(x, |mut y| Box::new(y.next()))
118118
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
119119
|
120-
= note: defining type: DefId(0:36 ~ projection_no_regions_closure[317d]::outlives_region[0]::{{closure}}[0]) with closure substs [
120+
= note: defining type: DefId(0:27 ~ projection_no_regions_closure[317d]::outlives_region[0]::{{closure}}[0]) with closure substs [
121121
'_#1r,
122122
'_#2r,
123123
T,
@@ -139,7 +139,7 @@ LL | | with_signature(x, |mut y| Box::new(y.next()))
139139
LL | | }
140140
| |_^
141141
|
142-
= note: defining type: DefId(0:32 ~ projection_no_regions_closure[317d]::outlives_region[0]) with substs [
142+
= note: defining type: DefId(0:23 ~ projection_no_regions_closure[317d]::outlives_region[0]) with substs [
143143
'_#1r,
144144
'_#2r,
145145
T,

‎src/test/ui/nll/ty-outlives/projection-one-region-closure.stderr

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | with_signature(cell, t, |cell, t| require(cell, t));
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:28 ~ projection_one_region_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:19 ~ projection_one_region_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
88
'_#1r,
99
T,
1010
i32,
@@ -27,7 +27,7 @@ LL | |
2727
LL | | }
2828
| |_^
2929
|
30-
= note: defining type: DefId(0:24 ~ projection_one_region_closure[317d]::no_relationships_late[0]) with substs [
30+
= note: defining type: DefId(0:15 ~ projection_one_region_closure[317d]::no_relationships_late[0]) with substs [
3131
'_#1r,
3232
T,
3333
]
@@ -38,7 +38,7 @@ error[E0309]: the parameter type `T` may not live long enough
3838
LL | with_signature(cell, t, |cell, t| require(cell, t));
3939
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
4040
|
41-
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:24 ~ projection_one_region_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(25), 'a))`...
41+
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:15 ~ projection_one_region_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(16), 'a))`...
4242

4343
error: lifetime may not live long enough
4444
--> $DIR/projection-one-region-closure.rs:45:39
@@ -57,7 +57,7 @@ note: External requirements
5757
LL | with_signature(cell, t, |cell, t| require(cell, t));
5858
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
5959
|
60-
= note: defining type: DefId(0:33 ~ projection_one_region_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
60+
= note: defining type: DefId(0:24 ~ projection_one_region_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
6161
'_#1r,
6262
'_#2r,
6363
T,
@@ -80,7 +80,7 @@ LL | |
8080
LL | | }
8181
| |_^
8282
|
83-
= note: defining type: DefId(0:29 ~ projection_one_region_closure[317d]::no_relationships_early[0]) with substs [
83+
= note: defining type: DefId(0:20 ~ projection_one_region_closure[317d]::no_relationships_early[0]) with substs [
8484
'_#1r,
8585
'_#2r,
8686
T,
@@ -111,7 +111,7 @@ note: External requirements
111111
LL | with_signature(cell, t, |cell, t| require(cell, t));
112112
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
113113
|
114-
= note: defining type: DefId(0:38 ~ projection_one_region_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
114+
= note: defining type: DefId(0:29 ~ projection_one_region_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
115115
'_#1r,
116116
'_#2r,
117117
T,
@@ -133,7 +133,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
133133
LL | | }
134134
| |_^
135135
|
136-
= note: defining type: DefId(0:34 ~ projection_one_region_closure[317d]::projection_outlives[0]) with substs [
136+
= note: defining type: DefId(0:25 ~ projection_one_region_closure[317d]::projection_outlives[0]) with substs [
137137
'_#1r,
138138
'_#2r,
139139
T,
@@ -145,7 +145,7 @@ note: External requirements
145145
LL | with_signature(cell, t, |cell, t| require(cell, t));
146146
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
147147
|
148-
= note: defining type: DefId(0:43 ~ projection_one_region_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
148+
= note: defining type: DefId(0:34 ~ projection_one_region_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
149149
'_#1r,
150150
'_#2r,
151151
T,
@@ -168,7 +168,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
168168
LL | | }
169169
| |_^
170170
|
171-
= note: defining type: DefId(0:39 ~ projection_one_region_closure[317d]::elements_outlive[0]) with substs [
171+
= note: defining type: DefId(0:30 ~ projection_one_region_closure[317d]::elements_outlive[0]) with substs [
172172
'_#1r,
173173
'_#2r,
174174
T,

‎src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-closure.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | with_signature(cell, t, |cell, t| require(cell, t));
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:28 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:19 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
88
'_#1r,
99
T,
1010
i32,
@@ -26,7 +26,7 @@ LL | |
2626
LL | | }
2727
| |_^
2828
|
29-
= note: defining type: DefId(0:24 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_late[0]) with substs [
29+
= note: defining type: DefId(0:15 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_late[0]) with substs [
3030
'_#1r,
3131
T,
3232
]
@@ -48,7 +48,7 @@ note: External requirements
4848
LL | with_signature(cell, t, |cell, t| require(cell, t));
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
5050
|
51-
= note: defining type: DefId(0:33 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
51+
= note: defining type: DefId(0:24 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
5252
'_#1r,
5353
'_#2r,
5454
T,
@@ -70,7 +70,7 @@ LL | |
7070
LL | | }
7171
| |_^
7272
|
73-
= note: defining type: DefId(0:29 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_early[0]) with substs [
73+
= note: defining type: DefId(0:20 ~ projection_one_region_trait_bound_closure[317d]::no_relationships_early[0]) with substs [
7474
'_#1r,
7575
'_#2r,
7676
T,
@@ -93,7 +93,7 @@ note: External requirements
9393
LL | with_signature(cell, t, |cell, t| require(cell, t));
9494
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
9595
|
96-
= note: defining type: DefId(0:38 ~ projection_one_region_trait_bound_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
96+
= note: defining type: DefId(0:29 ~ projection_one_region_trait_bound_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
9797
'_#1r,
9898
'_#2r,
9999
T,
@@ -115,7 +115,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
115115
LL | | }
116116
| |_^
117117
|
118-
= note: defining type: DefId(0:34 ~ projection_one_region_trait_bound_closure[317d]::projection_outlives[0]) with substs [
118+
= note: defining type: DefId(0:25 ~ projection_one_region_trait_bound_closure[317d]::projection_outlives[0]) with substs [
119119
'_#1r,
120120
'_#2r,
121121
T,
@@ -127,7 +127,7 @@ note: External requirements
127127
LL | with_signature(cell, t, |cell, t| require(cell, t));
128128
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
129129
|
130-
= note: defining type: DefId(0:43 ~ projection_one_region_trait_bound_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
130+
= note: defining type: DefId(0:34 ~ projection_one_region_trait_bound_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
131131
'_#1r,
132132
'_#2r,
133133
T,
@@ -149,7 +149,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
149149
LL | | }
150150
| |_^
151151
|
152-
= note: defining type: DefId(0:39 ~ projection_one_region_trait_bound_closure[317d]::elements_outlive[0]) with substs [
152+
= note: defining type: DefId(0:30 ~ projection_one_region_trait_bound_closure[317d]::elements_outlive[0]) with substs [
153153
'_#1r,
154154
'_#2r,
155155
T,
@@ -161,7 +161,7 @@ note: External requirements
161161
LL | with_signature(cell, t, |cell, t| require(cell, t));
162162
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
163163
|
164-
= note: defining type: DefId(0:47 ~ projection_one_region_trait_bound_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
164+
= note: defining type: DefId(0:38 ~ projection_one_region_trait_bound_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
165165
'_#1r,
166166
T,
167167
i32,
@@ -182,7 +182,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
182182
LL | | }
183183
| |_^
184184
|
185-
= note: defining type: DefId(0:44 ~ projection_one_region_trait_bound_closure[317d]::one_region[0]) with substs [
185+
= note: defining type: DefId(0:35 ~ projection_one_region_trait_bound_closure[317d]::one_region[0]) with substs [
186186
'_#1r,
187187
T,
188188
]

‎src/test/ui/nll/ty-outlives/projection-one-region-trait-bound-static-closure.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: No external requirements
44
LL | with_signature(cell, t, |cell, t| require(cell, t));
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:28 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:19 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
88
'_#1r,
99
T,
1010
i32,
@@ -23,7 +23,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
2323
LL | | }
2424
| |_^
2525
|
26-
= note: defining type: DefId(0:24 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_late[0]) with substs [
26+
= note: defining type: DefId(0:15 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_late[0]) with substs [
2727
'_#1r,
2828
T,
2929
]
@@ -34,7 +34,7 @@ note: No external requirements
3434
LL | with_signature(cell, t, |cell, t| require(cell, t));
3535
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
3636
|
37-
= note: defining type: DefId(0:33 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
37+
= note: defining type: DefId(0:24 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
3838
'_#1r,
3939
'_#2r,
4040
T,
@@ -54,7 +54,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
5454
LL | | }
5555
| |_^
5656
|
57-
= note: defining type: DefId(0:29 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_early[0]) with substs [
57+
= note: defining type: DefId(0:20 ~ projection_one_region_trait_bound_static_closure[317d]::no_relationships_early[0]) with substs [
5858
'_#1r,
5959
'_#2r,
6060
T,
@@ -66,7 +66,7 @@ note: No external requirements
6666
LL | with_signature(cell, t, |cell, t| require(cell, t));
6767
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
6868
|
69-
= note: defining type: DefId(0:38 ~ projection_one_region_trait_bound_static_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
69+
= note: defining type: DefId(0:29 ~ projection_one_region_trait_bound_static_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
7070
'_#1r,
7171
'_#2r,
7272
T,
@@ -86,7 +86,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
8686
LL | | }
8787
| |_^
8888
|
89-
= note: defining type: DefId(0:34 ~ projection_one_region_trait_bound_static_closure[317d]::projection_outlives[0]) with substs [
89+
= note: defining type: DefId(0:25 ~ projection_one_region_trait_bound_static_closure[317d]::projection_outlives[0]) with substs [
9090
'_#1r,
9191
'_#2r,
9292
T,
@@ -98,7 +98,7 @@ note: No external requirements
9898
LL | with_signature(cell, t, |cell, t| require(cell, t));
9999
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
100100
|
101-
= note: defining type: DefId(0:43 ~ projection_one_region_trait_bound_static_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
101+
= note: defining type: DefId(0:34 ~ projection_one_region_trait_bound_static_closure[317d]::elements_outlive[0]::{{closure}}[0]) with closure substs [
102102
'_#1r,
103103
'_#2r,
104104
T,
@@ -118,7 +118,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
118118
LL | | }
119119
| |_^
120120
|
121-
= note: defining type: DefId(0:39 ~ projection_one_region_trait_bound_static_closure[317d]::elements_outlive[0]) with substs [
121+
= note: defining type: DefId(0:30 ~ projection_one_region_trait_bound_static_closure[317d]::elements_outlive[0]) with substs [
122122
'_#1r,
123123
'_#2r,
124124
T,
@@ -130,7 +130,7 @@ note: No external requirements
130130
LL | with_signature(cell, t, |cell, t| require(cell, t));
131131
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
132132
|
133-
= note: defining type: DefId(0:47 ~ projection_one_region_trait_bound_static_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
133+
= note: defining type: DefId(0:38 ~ projection_one_region_trait_bound_static_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
134134
'_#1r,
135135
T,
136136
i32,
@@ -149,7 +149,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
149149
LL | | }
150150
| |_^
151151
|
152-
= note: defining type: DefId(0:44 ~ projection_one_region_trait_bound_static_closure[317d]::one_region[0]) with substs [
152+
= note: defining type: DefId(0:35 ~ projection_one_region_trait_bound_static_closure[317d]::one_region[0]) with substs [
153153
'_#1r,
154154
T,
155155
]

‎src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.stderr

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | with_signature(cell, t, |cell, t| require(cell, t));
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:31 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:22 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_late[0]::{{closure}}[0]) with closure substs [
88
'_#1r,
99
'_#2r,
1010
T,
@@ -27,7 +27,7 @@ LL | |
2727
LL | | }
2828
| |_^
2929
|
30-
= note: defining type: DefId(0:26 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_late[0]) with substs [
30+
= note: defining type: DefId(0:17 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_late[0]) with substs [
3131
'_#1r,
3232
'_#2r,
3333
T,
@@ -39,15 +39,15 @@ error[E0309]: the associated type `<T as Anything<'_#5r, '_#6r>>::AssocType` may
3939
LL | with_signature(cell, t, |cell, t| require(cell, t));
4040
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
4141
|
42-
= help: consider adding an explicit lifetime bound `<T as Anything<'_#5r, '_#6r>>::AssocType: ReFree(DefId(0:26 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(27), 'a))`...
42+
= help: consider adding an explicit lifetime bound `<T as Anything<'_#5r, '_#6r>>::AssocType: ReFree(DefId(0:17 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_late[0]), BrNamed(crate0:DefIndex(18), 'a))`...
4343

4444
note: External requirements
4545
--> $DIR/projection-two-region-trait-bound-closure.rs:48:29
4646
|
4747
LL | with_signature(cell, t, |cell, t| require(cell, t));
4848
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
4949
|
50-
= note: defining type: DefId(0:37 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
50+
= note: defining type: DefId(0:28 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_early[0]::{{closure}}[0]) with closure substs [
5151
'_#1r,
5252
'_#2r,
5353
'_#3r,
@@ -70,7 +70,7 @@ LL | |
7070
LL | | }
7171
| |_^
7272
|
73-
= note: defining type: DefId(0:32 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_early[0]) with substs [
73+
= note: defining type: DefId(0:23 ~ projection_two_region_trait_bound_closure[317d]::no_relationships_early[0]) with substs [
7474
'_#1r,
7575
'_#2r,
7676
'_#3r,
@@ -91,7 +91,7 @@ note: External requirements
9191
LL | with_signature(cell, t, |cell, t| require(cell, t));
9292
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
9393
|
94-
= note: defining type: DefId(0:43 ~ projection_two_region_trait_bound_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
94+
= note: defining type: DefId(0:34 ~ projection_two_region_trait_bound_closure[317d]::projection_outlives[0]::{{closure}}[0]) with closure substs [
9595
'_#1r,
9696
'_#2r,
9797
'_#3r,
@@ -114,7 +114,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
114114
LL | | }
115115
| |_^
116116
|
117-
= note: defining type: DefId(0:38 ~ projection_two_region_trait_bound_closure[317d]::projection_outlives[0]) with substs [
117+
= note: defining type: DefId(0:29 ~ projection_two_region_trait_bound_closure[317d]::projection_outlives[0]) with substs [
118118
'_#1r,
119119
'_#2r,
120120
'_#3r,
@@ -127,7 +127,7 @@ note: External requirements
127127
LL | with_signature(cell, t, |cell, t| require(cell, t));
128128
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
129129
|
130-
= note: defining type: DefId(0:49 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive1[0]::{{closure}}[0]) with closure substs [
130+
= note: defining type: DefId(0:40 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive1[0]::{{closure}}[0]) with closure substs [
131131
'_#1r,
132132
'_#2r,
133133
'_#3r,
@@ -150,7 +150,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
150150
LL | | }
151151
| |_^
152152
|
153-
= note: defining type: DefId(0:44 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive1[0]) with substs [
153+
= note: defining type: DefId(0:35 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive1[0]) with substs [
154154
'_#1r,
155155
'_#2r,
156156
'_#3r,
@@ -163,7 +163,7 @@ note: External requirements
163163
LL | with_signature(cell, t, |cell, t| require(cell, t));
164164
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
165165
|
166-
= note: defining type: DefId(0:55 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive2[0]::{{closure}}[0]) with closure substs [
166+
= note: defining type: DefId(0:46 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive2[0]::{{closure}}[0]) with closure substs [
167167
'_#1r,
168168
'_#2r,
169169
'_#3r,
@@ -186,7 +186,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
186186
LL | | }
187187
| |_^
188188
|
189-
= note: defining type: DefId(0:50 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive2[0]) with substs [
189+
= note: defining type: DefId(0:41 ~ projection_two_region_trait_bound_closure[317d]::elements_outlive2[0]) with substs [
190190
'_#1r,
191191
'_#2r,
192192
'_#3r,
@@ -199,7 +199,7 @@ note: External requirements
199199
LL | with_signature(cell, t, |cell, t| require(cell, t));
200200
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
201201
|
202-
= note: defining type: DefId(0:60 ~ projection_two_region_trait_bound_closure[317d]::two_regions[0]::{{closure}}[0]) with closure substs [
202+
= note: defining type: DefId(0:51 ~ projection_two_region_trait_bound_closure[317d]::two_regions[0]::{{closure}}[0]) with closure substs [
203203
'_#1r,
204204
T,
205205
i32,
@@ -221,7 +221,7 @@ LL | |
221221
LL | | }
222222
| |_^
223223
|
224-
= note: defining type: DefId(0:56 ~ projection_two_region_trait_bound_closure[317d]::two_regions[0]) with substs [
224+
= note: defining type: DefId(0:47 ~ projection_two_region_trait_bound_closure[317d]::two_regions[0]) with substs [
225225
'_#1r,
226226
T,
227227
]
@@ -243,7 +243,7 @@ note: External requirements
243243
LL | with_signature(cell, t, |cell, t| require(cell, t));
244244
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
245245
|
246-
= note: defining type: DefId(0:65 ~ projection_two_region_trait_bound_closure[317d]::two_regions_outlive[0]::{{closure}}[0]) with closure substs [
246+
= note: defining type: DefId(0:56 ~ projection_two_region_trait_bound_closure[317d]::two_regions_outlive[0]::{{closure}}[0]) with closure substs [
247247
'_#1r,
248248
'_#2r,
249249
T,
@@ -265,7 +265,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
265265
LL | | }
266266
| |_^
267267
|
268-
= note: defining type: DefId(0:61 ~ projection_two_region_trait_bound_closure[317d]::two_regions_outlive[0]) with substs [
268+
= note: defining type: DefId(0:52 ~ projection_two_region_trait_bound_closure[317d]::two_regions_outlive[0]) with substs [
269269
'_#1r,
270270
'_#2r,
271271
T,
@@ -277,7 +277,7 @@ note: External requirements
277277
LL | with_signature(cell, t, |cell, t| require(cell, t));
278278
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
279279
|
280-
= note: defining type: DefId(0:69 ~ projection_two_region_trait_bound_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
280+
= note: defining type: DefId(0:60 ~ projection_two_region_trait_bound_closure[317d]::one_region[0]::{{closure}}[0]) with closure substs [
281281
'_#1r,
282282
T,
283283
i32,
@@ -298,7 +298,7 @@ LL | | with_signature(cell, t, |cell, t| require(cell, t));
298298
LL | | }
299299
| |_^
300300
|
301-
= note: defining type: DefId(0:66 ~ projection_two_region_trait_bound_closure[317d]::one_region[0]) with substs [
301+
= note: defining type: DefId(0:57 ~ projection_two_region_trait_bound_closure[317d]::one_region[0]) with substs [
302302
'_#1r,
303303
T,
304304
]

‎src/test/ui/nll/ty-outlives/ty-param-closure-approximate-lower-bound.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | twice(cell, value, |a, b| invoke(a, b));
55
| ^^^^^^^^^^^^^^^^^^^
66
|
7-
= note: defining type: DefId(0:20 ~ ty_param_closure_approximate_lower_bound[317d]::generic[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:11 ~ ty_param_closure_approximate_lower_bound[317d]::generic[0]::{{closure}}[0]) with closure substs [
88
T,
99
i16,
1010
for<'r, 's> extern "rust-call" fn((std::option::Option<std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) ()>>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) T)),
@@ -21,7 +21,7 @@ LL | | twice(cell, value, |a, b| invoke(a, b));
2121
LL | | }
2222
| |_^
2323
|
24-
= note: defining type: DefId(0:18 ~ ty_param_closure_approximate_lower_bound[317d]::generic[0]) with substs [
24+
= note: defining type: DefId(0:9 ~ ty_param_closure_approximate_lower_bound[317d]::generic[0]) with substs [
2525
T,
2626
]
2727

@@ -31,7 +31,7 @@ note: External requirements
3131
LL | twice(cell, value, |a, b| invoke(a, b));
3232
| ^^^^^^^^^^^^^^^^^^^
3333
|
34-
= note: defining type: DefId(0:24 ~ ty_param_closure_approximate_lower_bound[317d]::generic_fail[0]::{{closure}}[0]) with closure substs [
34+
= note: defining type: DefId(0:15 ~ ty_param_closure_approximate_lower_bound[317d]::generic_fail[0]::{{closure}}[0]) with closure substs [
3535
T,
3636
i16,
3737
for<'r, 's> extern "rust-call" fn((std::option::Option<std::cell::Cell<&'_#1r &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 'r)) ()>>, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0), 's)) T)),
@@ -49,7 +49,7 @@ LL | |
4949
LL | | }
5050
| |_^
5151
|
52-
= note: defining type: DefId(0:21 ~ ty_param_closure_approximate_lower_bound[317d]::generic_fail[0]) with substs [
52+
= note: defining type: DefId(0:12 ~ ty_param_closure_approximate_lower_bound[317d]::generic_fail[0]) with substs [
5353
T,
5454
]
5555

@@ -59,7 +59,7 @@ error[E0309]: the parameter type `T` may not live long enough
5959
LL | twice(cell, value, |a, b| invoke(a, b));
6060
| ^^^^^^^^^^^^^^^^^^^
6161
|
62-
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:21 ~ ty_param_closure_approximate_lower_bound[317d]::generic_fail[0]), BrNamed(crate0:DefIndex(22), 'a))`...
62+
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:12 ~ ty_param_closure_approximate_lower_bound[317d]::generic_fail[0]), BrNamed(crate0:DefIndex(13), 'a))`...
6363

6464
error: aborting due to previous error
6565

‎src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-return-type.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ note: External requirements
44
LL | with_signature(x, |y| y)
55
| ^^^^^
66
|
7-
= note: defining type: DefId(0:20 ~ ty_param_closure_outlives_from_return_type[317d]::no_region[0]::{{closure}}[0]) with closure substs [
7+
= note: defining type: DefId(0:11 ~ ty_param_closure_outlives_from_return_type[317d]::no_region[0]::{{closure}}[0]) with closure substs [
88
'_#1r,
99
T,
1010
i32,
@@ -25,7 +25,7 @@ LL | |
2525
LL | | }
2626
| |_^
2727
|
28-
= note: defining type: DefId(0:17 ~ ty_param_closure_outlives_from_return_type[317d]::no_region[0]) with substs [
28+
= note: defining type: DefId(0:8 ~ ty_param_closure_outlives_from_return_type[317d]::no_region[0]) with substs [
2929
'_#1r,
3030
T,
3131
]

‎src/test/ui/nll/ty-outlives/ty-param-closure-outlives-from-where-clause.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | | require(&x, &y)
1111
LL | | })
1212
| |_____^
1313
|
14-
= note: defining type: DefId(0:23 ~ ty_param_closure_outlives_from_where_clause[317d]::no_region[0]::{{closure}}[0]) with closure substs [
14+
= note: defining type: DefId(0:14 ~ ty_param_closure_outlives_from_where_clause[317d]::no_region[0]::{{closure}}[0]) with closure substs [
1515
T,
1616
i32,
1717
extern "rust-call" fn((std::cell::Cell<&'_#1r ()>, T)),
@@ -32,7 +32,7 @@ LL | | })
3232
LL | | }
3333
| |_^
3434
|
35-
= note: defining type: DefId(0:20 ~ ty_param_closure_outlives_from_where_clause[317d]::no_region[0]) with substs [
35+
= note: defining type: DefId(0:11 ~ ty_param_closure_outlives_from_where_clause[317d]::no_region[0]) with substs [
3636
T,
3737
]
3838

@@ -49,7 +49,7 @@ LL | | require(&x, &y)
4949
LL | | })
5050
| |_____^
5151
|
52-
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:20 ~ ty_param_closure_outlives_from_where_clause[317d]::no_region[0]), BrNamed(crate0:DefIndex(21), 'a))`...
52+
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:11 ~ ty_param_closure_outlives_from_where_clause[317d]::no_region[0]), BrNamed(crate0:DefIndex(12), 'a))`...
5353

5454
note: External requirements
5555
--> $DIR/ty-param-closure-outlives-from-where-clause.rs:43:26
@@ -64,7 +64,7 @@ LL | | require(&x, &y)
6464
LL | | })
6565
| |_____^
6666
|
67-
= note: defining type: DefId(0:27 ~ ty_param_closure_outlives_from_where_clause[317d]::correct_region[0]::{{closure}}[0]) with closure substs [
67+
= note: defining type: DefId(0:18 ~ ty_param_closure_outlives_from_where_clause[317d]::correct_region[0]::{{closure}}[0]) with closure substs [
6868
'_#1r,
6969
T,
7070
i32,
@@ -85,7 +85,7 @@ LL | | })
8585
LL | | }
8686
| |_^
8787
|
88-
= note: defining type: DefId(0:24 ~ ty_param_closure_outlives_from_where_clause[317d]::correct_region[0]) with substs [
88+
= note: defining type: DefId(0:15 ~ ty_param_closure_outlives_from_where_clause[317d]::correct_region[0]) with substs [
8989
'_#1r,
9090
T,
9191
]
@@ -101,7 +101,7 @@ LL | | require(&x, &y)
101101
LL | | })
102102
| |_____^
103103
|
104-
= note: defining type: DefId(0:32 ~ ty_param_closure_outlives_from_where_clause[317d]::wrong_region[0]::{{closure}}[0]) with closure substs [
104+
= note: defining type: DefId(0:23 ~ ty_param_closure_outlives_from_where_clause[317d]::wrong_region[0]::{{closure}}[0]) with closure substs [
105105
'_#1r,
106106
T,
107107
i32,
@@ -123,7 +123,7 @@ LL | | })
123123
LL | | }
124124
| |_^
125125
|
126-
= note: defining type: DefId(0:28 ~ ty_param_closure_outlives_from_where_clause[317d]::wrong_region[0]) with substs [
126+
= note: defining type: DefId(0:19 ~ ty_param_closure_outlives_from_where_clause[317d]::wrong_region[0]) with substs [
127127
'_#1r,
128128
T,
129129
]
@@ -139,7 +139,7 @@ LL | | require(&x, &y)
139139
LL | | })
140140
| |_____^
141141
|
142-
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:28 ~ ty_param_closure_outlives_from_where_clause[317d]::wrong_region[0]), BrNamed(crate0:DefIndex(29), 'a))`...
142+
= help: consider adding an explicit lifetime bound `T: ReFree(DefId(0:19 ~ ty_param_closure_outlives_from_where_clause[317d]::wrong_region[0]), BrNamed(crate0:DefIndex(20), 'a))`...
143143

144144
note: External requirements
145145
--> $DIR/ty-param-closure-outlives-from-where-clause.rs:77:26
@@ -151,7 +151,7 @@ LL | | require(&x, &y)
151151
LL | | })
152152
| |_____^
153153
|
154-
= note: defining type: DefId(0:37 ~ ty_param_closure_outlives_from_where_clause[317d]::outlives_region[0]::{{closure}}[0]) with closure substs [
154+
= note: defining type: DefId(0:28 ~ ty_param_closure_outlives_from_where_clause[317d]::outlives_region[0]::{{closure}}[0]) with closure substs [
155155
'_#1r,
156156
'_#2r,
157157
T,
@@ -173,7 +173,7 @@ LL | | })
173173
LL | | }
174174
| |_^
175175
|
176-
= note: defining type: DefId(0:33 ~ ty_param_closure_outlives_from_where_clause[317d]::outlives_region[0]) with substs [
176+
= note: defining type: DefId(0:24 ~ ty_param_closure_outlives_from_where_clause[317d]::outlives_region[0]) with substs [
177177
'_#1r,
178178
'_#2r,
179179
T,

0 commit comments

Comments
 (0)
Please sign in to comment.