mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use LanguageItems::require

Browse Source
This commit is contained in:
Jason Newcomb 2021-03-02 13:06:30 -05:00
parent f21320fd74
commit e4ffff9e72
No known key found for this signature in database
GPG Key ID: DA59E8643A37ED06
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clippy_lints/src/lifetimes.rs
View File

@ -360,7 +360,7 @@ impl<'a, 'tcx> Visitor<'tcx> for RefVisitor<'a, 'tcx> {
let trait_ref = &poly_tref.trait_ref;
if CLOSURE_TRAIT_BOUNDS
.iter()
.any(|&item| trait_ref.trait_def_id() == self.cx.tcx.lang_items().items()[item as usize])
.any(|&item| trait_ref.trait_def_id() == self.cx.tcx.lang_items().require(item).ok())
{
let mut sub_visitor = RefVisitor::new(self.cx);
sub_visitor.visit_trait_ref(trait_ref);

8
clippy_lints/src/types.rs
View File

@ -294,7 +294,7 @@ fn is_ty_param_lang_item(cx: &LateContext<'_>, qpath: &QPath<'tcx>, item: LangIt
if let TyKind::Path(qpath) = &ty.kind {
cx.qpath_res(qpath, ty.hir_id)
.opt_def_id()
.and_then(|id| (cx.tcx.lang_items().items()[item as usize] == Some(id)).then(|| ty))
.and_then(|id| (cx.tcx.lang_items().require(item) == Ok(id)).then(|| ty))
} else {
None
}
@ -431,7 +431,7 @@ impl Types {
};
let inner_span = match get_qpath_generic_tys(qpath).next() {
Some(ty) => ty.span,
_ => return,
None => return,
};
let mut applicability = Applicability::MachineApplicable;
span_lint_and_sugg(
@ -467,7 +467,7 @@ impl Types {
};
let inner_span = match get_qpath_generic_tys(qpath).next() {
Some(ty) => ty.span,
_ => return,
None => return,
};
let mut applicability = Applicability::MachineApplicable;
span_lint_and_sugg(
@ -517,7 +517,7 @@ impl Types {
};
let inner_span = match get_qpath_generic_tys(qpath).next() {
Some(ty) => ty.span,
_ => return,
None => return,
};
let mut applicability = Applicability::MachineApplicable;
span_lint_and_sugg(