Fix rebase conflicts

1 files changed, 9 insertions, 12 deletions

diff --git a/src/test/run-pass/trait-static-method-generic-inference.rs b/src/test/compile-fail/trait-static-method-generic-inference.rs
index 4151ad6530e..651f663fc99 100644
--- a/src/test/run-pass/trait-static-method-generic-inference.rs
+++ b/src/test/compile-fail/trait-static-method-generic-inference.rs
@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// Issue #3902. We are (at least currently) unable to infer `Self`
+// based on `T`, even though there is only a single impl, because of
+// the possibility of associated types and other things (basically: no
+// constraints on `Self` here at all).
+
 mod base {
     pub trait HasNew<T> {
         fn new() -> T;
@@ -22,19 +27,11 @@ mod base {
             Foo { dummy: () }
         }
     }
-
-    pub struct Bar {
-        dummy: (),
-    }
-
-    impl HasNew<Bar> for Bar {
-        fn new() -> Bar {
-            Bar { dummy: () }
-        }
-    }
 }
 
-pub fn main() {
+pub fn foo() {
     let _f: base::Foo = base::HasNew::new();
-    let _b: base::Bar = base::HasNew::new();
+    //~^ ERROR type annotations required
 }
+
+fn main() { }