Use AssocItemContainer more

Author: camsteffen

compiler/rustc_hir_typeck/src/method/confirm.rs

@@ -272,11 +272,13 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
     ) -> GenericArgsRef<'tcx> {
         match pick.kind {
             probe::InherentImplPick => {
-                let impl_def_id = pick.item.container_id(self.tcx);
-                assert!(
-                    self.tcx.impl_trait_ref(impl_def_id).is_none(),
-                    "impl {impl_def_id:?} is not an inherent impl"
+                assert_eq!(
+                    pick.item.container,
+                    ty::AssocItemContainer::InherentImpl,
+                    "{:?} is not in an inherent impl",
+                    pick.item.def_id,
                 );
+                let impl_def_id = pick.item.container_id(self.tcx);
                 self.fresh_args_for_item(self.span, impl_def_id)
             }
 

compiler/rustc_lint/src/nonstandard_style.rs

@@ -20,11 +20,6 @@ use crate::lints::{
 };
 use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
 
-fn assoc_item_in_trait_impl(cx: &LateContext<'_>, ii: &hir::ImplItem<'_>) -> bool {
-    let item = cx.tcx.associated_item(ii.owner_id);
-    item.trait_item_def_id.is_some()
-}
-
 declare_lint! {
     /// The `non_camel_case_types` lint detects types, variants, traits and
     /// type parameters that don't have camel case names.
@@ -592,7 +587,7 @@ impl<'tcx> LateLintPass<'tcx> for NonUpperCaseGlobals {
 
     fn check_impl_item(&mut self, cx: &LateContext<'_>, ii: &hir::ImplItem<'_>) {
         if let hir::ImplItemKind::Const(..) = ii.kind
-            && !assoc_item_in_trait_impl(cx, ii)
+            && cx.tcx.associated_item(ii.owner_id).container != AssocItemContainer::TraitImpl
         {
             NonUpperCaseGlobals::check_upper_case(cx, "associated constant", None, &ii.ident);
         }