about summary refs log tree commit diff
path: root/compiler/rustc_hir_analysis/src/variance/mod.rs
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2023-03-13 18:54:05 +0000
committerMichael Goulet <michael@errs.io>2023-03-21 15:38:51 +0000
commit2eb1c08e433aadf2362a65f2ef1387670a6d34cf (patch)
tree1d8465f4d80adbbe4a44dd72eedc3361bd2b8f7c /compiler/rustc_hir_analysis/src/variance/mod.rs
parenta01b4cc9f375f1b95fa8195daeea938d3d9c4c34 (diff)
downloadrust-2eb1c08e433aadf2362a65f2ef1387670a6d34cf.tar.gz
rust-2eb1c08e433aadf2362a65f2ef1387670a6d34cf.zip
Use local key in providers
Diffstat (limited to 'compiler/rustc_hir_analysis/src/variance/mod.rs')
-rw-r--r--compiler/rustc_hir_analysis/src/variance/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_hir_analysis/src/variance/mod.rs b/compiler/rustc_hir_analysis/src/variance/mod.rs
index 361e8948e85..72be951839d 100644
--- a/compiler/rustc_hir_analysis/src/variance/mod.rs
+++ b/compiler/rustc_hir_analysis/src/variance/mod.rs
@@ -38,7 +38,7 @@ fn crate_variances(tcx: TyCtxt<'_>, (): ()) -> CrateVariancesMap<'_> {
     solve::solve_constraints(constraints_cx)
 }
 
-fn variances_of(tcx: TyCtxt<'_>, item_def_id: DefId) -> &[ty::Variance] {
+fn variances_of(tcx: TyCtxt<'_>, item_def_id: LocalDefId) -> &[ty::Variance] {
     // Skip items with no generics - there's nothing to infer in them.
     if tcx.generics_of(item_def_id).count() == 0 {
         return &[];
@@ -53,7 +53,7 @@ fn variances_of(tcx: TyCtxt<'_>, item_def_id: DefId) -> &[ty::Variance] {
         | DefKind::Variant
         | DefKind::Ctor(..) => {}
         DefKind::OpaqueTy | DefKind::ImplTraitPlaceholder => {
-            return variance_of_opaque(tcx, item_def_id.expect_local());
+            return variance_of_opaque(tcx, item_def_id);
         }
         _ => {
             // Variance not relevant.
@@ -64,7 +64,7 @@ fn variances_of(tcx: TyCtxt<'_>, item_def_id: DefId) -> &[ty::Variance] {
     // Everything else must be inferred.
 
     let crate_map = tcx.crate_variances(());
-    crate_map.variances.get(&item_def_id).copied().unwrap_or(&[])
+    crate_map.variances.get(&item_def_id.to_def_id()).copied().unwrap_or(&[])
 }
 
 #[instrument(level = "trace", skip(tcx), ret)]