about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2017-10-28 15:56:25 +0800
committerGitHub <noreply@github.com>2017-10-28 15:56:25 +0800
commit0b0237761458d634b9082d4f863bbe18c64349e7 (patch)
tree49fe52a06bc13f126f969f3be93bfbf0c2cc7fae
parent65f1df594a35ed894ea32a3a6e5b92e91ce84c99 (diff)
parentb1681271e57b7c67b1aafdd013831b61639b1801 (diff)
downloadrust-0b0237761458d634b9082d4f863bbe18c64349e7.tar.gz
rust-0b0237761458d634b9082d4f863bbe18c64349e7.zip
Rollup merge of #45585 - frewsxcv:frewsxcv-diagnostic, r=kennytm
Remove 'future Rust version' code block in diagnostic text.

Fixes https://github.com/rust-lang/rust/issues/43780.
-rw-r--r--src/librustc/diagnostics.rs10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index c9c03a2f795..2b6e1d85568 100644
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@@ -401,16 +401,6 @@ fn bar(x: &str, y: &str) -> &str { }
 fn baz<'a>(x: &'a str, y: &str) -> &str { }
 ```
 
-Here's an example that is currently an error, but may work in a future version
-of Rust:
-
-```compile_fail,E0106
-struct Foo<'a>(&'a str);
-
-trait Quux { }
-impl Quux for Foo { }
-```
-
 Lifetime elision in implementation headers was part of the lifetime elision
 RFC. It is, however, [currently unimplemented][iss15872].