Disallow methods from shadowed traits

src/librustc_resolve/resolve_imports.rs

@@ -743,9 +743,9 @@ fn finalize_resolutions(&mut self, module: Module<'b>, report_unresolved_imports
                 }
             }
 
-            // FIXME #31379: We can use methods from imported traits shadowed by non-import items
-            if !binding.is_import() {
-                for glob_binding in resolution.duplicate_globs.iter() {
+            // We can always use methods from the prelude traits
+            for glob_binding in resolution.duplicate_globs.iter() {
+                if glob_binding.defined_with(DefModifiers::PRELUDE) {
                     module.shadowed_traits.borrow_mut().push(glob_binding);
                 }
             }