about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2020-04-14 15:21:19 -0700
committerEsteban Küber <esteban@kuber.com.ar>2020-05-02 18:24:07 -0700
commit6648a08b30636cffa9dafd258b372a1bc25da549 (patch)
treef2a4cdea901cc0c0b3680c0f197e26a2c9cac860
parent299bd12fe5edb4a99f85b1a94b9f9e7ce5365654 (diff)
downloadrust-6648a08b30636cffa9dafd258b372a1bc25da549.tar.gz
rust-6648a08b30636cffa9dafd258b372a1bc25da549.zip
fix rebase
-rw-r--r--src/librustc_middle/ty/error.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_middle/ty/error.rs b/src/librustc_middle/ty/error.rs
index 14909fff1ce..1b6526cd49c 100644
--- a/src/librustc_middle/ty/error.rs
+++ b/src/librustc_middle/ty/error.rs
@@ -642,7 +642,7 @@ impl<T> Trait<T> for X {
                 .items
                 .iter()
                 .filter(|(name, item)| {
-                    ty::AssocKind::Method == item.kind && Some(**name) != current_method_ident
+                    ty::AssocKind::Fn == item.kind && Some(**name) != current_method_ident
                 })
                 .filter_map(|(_, item)| {
                     let method = self.fn_sig(item.def_id);