about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authormarmeladema <xademax@gmail.com>2020-04-18 17:10:50 +0100
committermarmeladema <xademax@gmail.com>2020-04-27 23:58:11 +0100
commit14119a2a05532a719628682f620137aa6a55cd8c (patch)
tree30ff144d3fb94f1205d908d518773414da972461 /src
parentd9e5fa15ff0582acdcabf2f76a5a48937797b9e0 (diff)
downloadrust-14119a2a05532a719628682f620137aa6a55cd8c.tar.gz
rust-14119a2a05532a719628682f620137aa6a55cd8c.zip
Accept `LocalDefId` as key for `check_trait_item_well_formed` query
Diffstat (limited to 'src')
-rw-r--r--src/librustc_middle/query/mod.rs4
-rw-r--r--src/librustc_typeck/check/mod.rs4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/librustc_middle/query/mod.rs b/src/librustc_middle/query/mod.rs
index 0c607a99dfd..68fe36d4454 100644
--- a/src/librustc_middle/query/mod.rs
+++ b/src/librustc_middle/query/mod.rs
@@ -807,7 +807,9 @@ rustc_queries! {
         query check_item_well_formed(key: LocalDefId) -> () {
             desc { |tcx| "processing `{}`", tcx.def_path_str(key.to_def_id()) }
         }
-        query check_trait_item_well_formed(_: DefId) -> () {}
+        query check_trait_item_well_formed(key: LocalDefId) -> () {
+            desc { |tcx| "processing `{}`", tcx.def_path_str(key.to_def_id()) }
+        }
         query check_impl_item_well_formed(_: DefId) -> () {}
     }
 
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index f4001fd238e..ccce1f1d34e 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -758,8 +758,8 @@ fn check_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
     wfcheck::check_item_well_formed(tcx, def_id);
 }
 
-fn check_trait_item_well_formed(tcx: TyCtxt<'_>, def_id: DefId) {
-    wfcheck::check_trait_item(tcx, def_id.expect_local());
+fn check_trait_item_well_formed(tcx: TyCtxt<'_>, def_id: LocalDefId) {
+    wfcheck::check_trait_item(tcx, def_id);
 }
 
 fn check_impl_item_well_formed(tcx: TyCtxt<'_>, def_id: DefId) {