Skip to content

Commit 366dd1b

Browse files
committed
Avoid spurious in lifetime diagnostics
1 parent e8cf5f3 commit 366dd1b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/librustc/ty/error.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,16 @@ impl<'tcx> fmt::Display for TypeError<'tcx> {
117117
write!(f, "lifetimes do not intersect")
118118
}
119119
RegionsInsufficientlyPolymorphic(br, _, _) => {
120-
write!(f, "expected bound lifetime parameter {}, \
121-
found concrete lifetime", br)
120+
write!(f,
121+
"expected bound lifetime parameter{}{}, found concrete lifetime",
122+
if br.is_named() { " " } else { "" },
123+
br)
122124
}
123125
RegionsOverlyPolymorphic(br, _, _) => {
124-
write!(f, "expected concrete lifetime, \
125-
found bound lifetime parameter {}", br)
126+
write!(f,
127+
"expected concrete lifetime, found bound lifetime parameter{}{}",
128+
if br.is_named() { " " } else { "" },
129+
br)
126130
}
127131
Sorts(values) => ty::tls::with(|tcx| {
128132
report_maybe_different(f, values.expected.sort_string(tcx),

0 commit comments

Comments
 (0)