Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-28 15:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5910 - flip1995:rustup, r=flip1995

Browse source 
Rustup

r? @ghost

changelog: none
This commit is contained in:
bors 2020-08-15 12:05:11 +00:00
commit f0cc006964
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clippy_lints/src/derive.rs
View file

@ -224,7 +224,7 @@ fn check_hash_peq<'tcx>(
mess, mess,
|diag| { |diag| {
if let Some(local_def_id) = impl_id.as_local() { if let Some(local_def_id) = impl_id.as_local() {
let hir_id = cx.tcx.hir().as_local_hir_id(local_def_id); let hir_id = cx.tcx.hir().local_def_id_to_hir_id(local_def_id);
diag.span_note( diag.span_note(
cx.tcx.hir().span(hir_id), cx.tcx.hir().span(hir_id),
"`PartialEq` implemented here" "`PartialEq` implemented here"
@ -278,7 +278,7 @@ fn check_ord_partial_ord<'tcx>(
mess, mess,
|diag| { |diag| {
if let Some(local_def_id) = impl_id.as_local() { if let Some(local_def_id) = impl_id.as_local() {
let hir_id = cx.tcx.hir().as_local_hir_id(local_def_id); let hir_id = cx.tcx.hir().local_def_id_to_hir_id(local_def_id);
diag.span_note( diag.span_note(
cx.tcx.hir().span(hir_id), cx.tcx.hir().span(hir_id),
"`PartialOrd` implemented here" "`PartialOrd` implemented here"
@ -341,7 +341,7 @@ fn check_unsafe_derive_deserialize<'tcx>(
ty: Ty<'tcx>, ty: Ty<'tcx>,
) { ) {
fn item_from_def_id<'tcx>(cx: &LateContext<'tcx>, def_id: DefId) -> &'tcx Item<'tcx> { fn item_from_def_id<'tcx>(cx: &LateContext<'tcx>, def_id: DefId) -> &'tcx Item<'tcx> {
let hir_id = cx.tcx.hir().as_local_hir_id(def_id.expect_local()); let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id.expect_local());
cx.tcx.hir().expect_item(hir_id) cx.tcx.hir().expect_item(hir_id)
} }
@ -355,7 +355,7 @@ fn check_unsafe_derive_deserialize<'tcx>(
if match_path(&trait_ref.path, &paths::SERDE_DESERIALIZE); if match_path(&trait_ref.path, &paths::SERDE_DESERIALIZE);
if let ty::Adt(def, _) = ty.kind; if let ty::Adt(def, _) = ty.kind;
if let Some(local_def_id) = def.did.as_local(); if let Some(local_def_id) = def.did.as_local();
let adt_hir_id = cx.tcx.hir().as_local_hir_id(local_def_id); let adt_hir_id = cx.tcx.hir().local_def_id_to_hir_id(local_def_id);
if !is_allowed(cx, UNSAFE_DERIVE_DESERIALIZE, adt_hir_id); if !is_allowed(cx, UNSAFE_DERIVE_DESERIALIZE, adt_hir_id);
if cx.tcx.inherent_impls(def.did) if cx.tcx.inherent_impls(def.did)
.iter() .iter()

2
clippy_lints/src/new_without_default.rs
View file

@ -103,7 +103,7 @@ impl<'tcx> LateLintPass<'tcx> for NewWithoutDefault {
cx.tcx.for_each_impl(default_trait_id, |d| { cx.tcx.for_each_impl(default_trait_id, |d| {
if let Some(ty_def) = cx.tcx.type_of(d).ty_adt_def() { if let Some(ty_def) = cx.tcx.type_of(d).ty_adt_def() {
if let Some(local_def_id) = ty_def.did.as_local() { if let Some(local_def_id) = ty_def.did.as_local() {
impls.insert(cx.tcx.hir().as_local_hir_id(local_def_id)); impls.insert(cx.tcx.hir().local_def_id_to_hir_id(local_def_id));
} }
} }
}); });