about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2017-04-23 15:37:16 -0700
committerEsteban Küber <esteban@kuber.com.ar>2017-04-23 15:54:49 -0700
commit366dd1bd3fbabd020cd9acd8f12065e488acc3d6 (patch)
treebc4144bfc792f445839458b1c4d8a4819e688d3c /src
parente8cf5f366263533bd739c4dda9bc8a57ec55b8b9 (diff)
downloadrust-366dd1bd3fbabd020cd9acd8f12065e488acc3d6.tar.gz
rust-366dd1bd3fbabd020cd9acd8f12065e488acc3d6.zip
Avoid spurious ` ` in lifetime diagnostics
Diffstat (limited to 'src')
-rw-r--r--src/librustc/ty/error.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/librustc/ty/error.rs b/src/librustc/ty/error.rs
index 73d9c8b00ae..e41202771cc 100644
--- a/src/librustc/ty/error.rs
+++ b/src/librustc/ty/error.rs
@@ -117,12 +117,16 @@ impl<'tcx> fmt::Display for TypeError<'tcx> {
                 write!(f, "lifetimes do not intersect")
             }
             RegionsInsufficientlyPolymorphic(br, _, _) => {
-                write!(f, "expected bound lifetime parameter {}, \
-                           found concrete lifetime", br)
+                write!(f,
+                       "expected bound lifetime parameter{}{}, found concrete lifetime",
+                       if br.is_named() { " " } else { "" },
+                       br)
             }
             RegionsOverlyPolymorphic(br, _, _) => {
-                write!(f, "expected concrete lifetime, \
-                           found bound lifetime parameter {}", br)
+                write!(f,
+                       "expected concrete lifetime, found bound lifetime parameter{}{}",
+                       if br.is_named() { " " } else { "" },
+                       br)
             }
             Sorts(values) => ty::tls::with(|tcx| {
                 report_maybe_different(f, values.expected.sort_string(tcx),