about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-27 09:59:12 +0000
committerbors <bors@rust-lang.org>2018-04-27 09:59:12 +0000
commitada45fd49a2dfcf2a163e1f4641ac34f2803eb9b (patch)
treebd3fcd8de7fc6476dc94cef471a7020c8c3a5936 /src/test
parent9822b5709ca78d6398e9ae609de0181116e8b0db (diff)
parent44b53598507b88bd256477cb4717ec6817ffbcec (diff)
downloadrust-ada45fd49a2dfcf2a163e1f4641ac34f2803eb9b.tar.gz
rust-ada45fd49a2dfcf2a163e1f4641ac34f2803eb9b.zip
Auto merge of #50275 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests

Successful merges:

 - #49707 (Add "the Rustc book")
 - #50222 (Bump bootstrap compiler to 2018-04-24)
 - #50227 (Fix ICE with erroneous `impl Trait` in a trait impl)
 - #50229 (Add setting to go to item if there is only one result)
 - #50231 (Add more doc aliases)
 - #50246 (Make dump_{alloc,allocs,local}() no-ops when tracing is disabled.)
 - #49894 (Rename InternedString to LocalInternedString and introduce a new thread-safe InternedString)

Failed merges:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/impl-trait/impl-generic-mismatch.rs11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/test/compile-fail/impl-trait/impl-generic-mismatch.rs b/src/test/compile-fail/impl-trait/impl-generic-mismatch.rs
index eea7ca20957..d6707f59011 100644
--- a/src/test/compile-fail/impl-trait/impl-generic-mismatch.rs
+++ b/src/test/compile-fail/impl-trait/impl-generic-mismatch.rs
@@ -28,4 +28,15 @@ impl Bar for () {
     //~^ Error method `bar` has incompatible signature for trait
 }
 
+// With non-local trait (#49841):
+
+use std::hash::{Hash, Hasher};
+
+struct X;
+
+impl Hash for X {
+    fn hash(&self, hasher: &mut impl Hasher) {}
+    //~^ Error method `hash` has incompatible signature for trait
+}
+
 fn main() {}