From 64df2ee1eb3fb9eee420b13b48d59fdb5ae2c23d Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Tue, 22 Mar 2022 10:35:17 -0300 Subject: [PATCH] impl_header -> impl_subject --- compiler/rustc_middle/src/hir/mod.rs | 2 +- compiler/rustc_trait_selection/src/traits/coherence.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_middle/src/hir/mod.rs b/compiler/rustc_middle/src/hir/mod.rs index 4bc0d3a4d860..a9e22d16ee05 100644 --- a/compiler/rustc_middle/src/hir/mod.rs +++ b/compiler/rustc_middle/src/hir/mod.rs @@ -55,7 +55,7 @@ impl<'tcx> TyCtxt<'tcx> { self.parent_module_from_def_id(id.owner) } - pub fn impl_header(self, def_id: DefId) -> ImplSubject<'tcx> { + pub fn impl_subject(self, def_id: DefId) -> ImplSubject<'tcx> { self.impl_trait_ref(def_id) .map(ImplSubject::Trait) .unwrap_or_else(|| ImplSubject::Inherent(self.type_of(def_id))) diff --git a/compiler/rustc_trait_selection/src/traits/coherence.rs b/compiler/rustc_trait_selection/src/traits/coherence.rs index a0fbf94c01d4..559401c0bd11 100644 --- a/compiler/rustc_trait_selection/src/traits/coherence.rs +++ b/compiler/rustc_trait_selection/src/traits/coherence.rs @@ -307,7 +307,7 @@ fn negative_impl<'cx, 'tcx>( // create a parameter environment corresponding to a (placeholder) instantiation of impl1 let impl1_env = tcx.param_env(impl1_def_id); - match tcx.impl_header(impl1_def_id) { + match tcx.impl_subject(impl1_def_id) { ImplSubject::Trait(impl1_trait_ref) => { // Normalize the trait reference. The WF rules ought to ensure // that this always succeeds.