about summary refs log tree commit diff
diff options
context:
space:
mode:
authorleonardo.yvens <leoyvens@gmail.com>2017-10-15 17:58:25 -0200
committerleonardo.yvens <leoyvens@gmail.com>2017-11-03 16:13:22 -0200
commit94b07a91bcaad498c18729f187a739e8a86a451c (patch)
treee72dd1f3840ca399dd600683ae342fb0f2b361ba
parent97de8cae6ed16789e955f5e2c1849928ae6ae616 (diff)
downloadrust-94b07a91bcaad498c18729f187a739e8a86a451c.tar.gz
rust-94b07a91bcaad498c18729f187a739e8a86a451c.zip
update unstable book and error example
-rw-r--r--src/doc/unstable-book/src/language-features/optin-builtin-traits.md4
-rw-r--r--src/librustc_typeck/diagnostics.rs2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/doc/unstable-book/src/language-features/optin-builtin-traits.md b/src/doc/unstable-book/src/language-features/optin-builtin-traits.md
index ee24dd87d90..97b57c690fc 100644
--- a/src/doc/unstable-book/src/language-features/optin-builtin-traits.md
+++ b/src/doc/unstable-book/src/language-features/optin-builtin-traits.md
@@ -24,9 +24,7 @@ Example:
 ```rust
 #![feature(optin_builtin_traits)]
 
-trait Valid {}
-
-impl Valid for .. {}
+auto trait Valid {}
 
 struct True;
 struct False;
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index 33a0c2c34a3..013eb9c8ed2 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -1854,7 +1854,7 @@ unsafe impl !Clone for Foo { }
 
 This will compile:
 
-```
+```ignore (ignore auto_trait future compatibility warning)
 #![feature(optin_builtin_traits)]
 
 struct Foo;