Skip to content

Commit c3db185

Browse files
authored
Rollup merge of rust-lang#101498 - petrochenkov:visparam, r=cjgillot
rustc: Parameterize `ty::Visibility` over used ID It allows using `LocalDefId` instead of `DefId` when possible, and also encode cheaper `Visibility<DefIndex>` into metadata.
2 parents 567e1bb + 9136096 commit c3db185

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clippy_lints/src/default.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ impl<'tcx> LateLintPass<'tcx> for Default {
142142
if adt.is_struct();
143143
let variant = adt.non_enum_variant();
144144
if adt.did().is_local() || !variant.is_field_list_non_exhaustive();
145-
let module_did = cx.tcx.parent_module(stmt.hir_id).to_def_id();
145+
let module_did = cx.tcx.parent_module(stmt.hir_id);
146146
if variant
147147
.fields
148148
.iter()

clippy_lints/src/derive.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use rustc_middle::hir::nested_filter;
1515
use rustc_middle::traits::Reveal;
1616
use rustc_middle::ty::{
1717
self, Binder, BoundConstness, GenericParamDefKind, ImplPolarity, ParamEnv, PredicateKind, TraitPredicate, TraitRef,
18-
Ty, TyCtxt, Visibility,
18+
Ty, TyCtxt,
1919
};
2020
use rustc_session::{declare_lint_pass, declare_tool_lint};
2121
use rustc_span::source_map::Span;
@@ -464,7 +464,7 @@ impl<'tcx> Visitor<'tcx> for UnsafeVisitor<'_, 'tcx> {
464464
fn check_partial_eq_without_eq<'tcx>(cx: &LateContext<'tcx>, span: Span, trait_ref: &hir::TraitRef<'_>, ty: Ty<'tcx>) {
465465
if_chain! {
466466
if let ty::Adt(adt, substs) = ty.kind();
467-
if cx.tcx.visibility(adt.did()) == Visibility::Public;
467+
if cx.tcx.visibility(adt.did()).is_public();
468468
if let Some(eq_trait_def_id) = cx.tcx.get_diagnostic_item(sym::Eq);
469469
if let Some(def_id) = trait_ref.trait_def_id();
470470
if cx.tcx.is_diagnostic_item(sym::PartialEq, def_id);

0 commit comments

Comments
 (0)