Skip to content

Commit 7bfc26e

Browse files
borsbors
committed
Auto merge of #7558 - flip1995:rustup, r=flip1995
Rustup r? `@ghost` changelog: none
2 parents 62f4187 + c3995b5 commit 7bfc26e

File tree

97 files changed

+1025
-994
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1025
-994
lines changed

‎Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "clippy"
33
version = "0.1.56"
4-
authors = ["The Rust Clippy Developers"]
54
description = "A bunch of helpful lints to avoid common pitfalls in Rust"
65
repository = "https://github.com/rust-lang/rust-clippy"
76
readme = "README.md"

‎clippy_dev/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "clippy_dev"
33
version = "0.0.1"
4-
authors = ["The Rust Clippy Developers"]
54
edition = "2018"
65

76
[dependencies]

‎clippy_dummy/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[package]
22
name = "clippy_dummy" # rename to clippy before publishing
33
version = "0.0.303"
4-
authors = ["The Rust Clippy Developers"]
54
edition = "2018"
65
readme = "crates-readme.md"
76
description = "A bunch of helpful lints to avoid common pitfalls in Rust."

‎clippy_lints/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name = "clippy_lints"
33
# begin automatic update
44
version = "0.1.56"
55
# end automatic update
6-
authors = ["The Rust Clippy Developers"]
76
description = "A bunch of helpful lints to avoid common pitfalls in Rust"
87
repository = "https://github.com/rust-lang/rust-clippy"
98
readme = "README.md"

‎clippy_lints/src/doc.rs

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use rustc_parse::maybe_new_parser_from_source_str;
2121
use rustc_parse::parser::ForceCollect;
2222
use rustc_session::parse::ParseSess;
2323
use rustc_session::{declare_tool_lint, impl_lint_pass};
24+
use rustc_span::def_id::LocalDefId;
2425
use rustc_span::edition::Edition;
2526
use rustc_span::source_map::{BytePos, FilePathMapping, MultiSpan, SourceMap, Span};
2627
use rustc_span::{sym, FileName, Pos};
@@ -229,15 +230,7 @@ impl<'tcx> LateLintPass<'tcx> for DocMarkdown {
229230
panic_span: None,
230231
};
231232
fpu.visit_expr(&body.value);
232-
lint_for_missing_headers(
233-
cx,
234-
item.hir_id(),
235-
item.span,
236-
sig,
237-
headers,
238-
Some(body_id),
239-
fpu.panic_span,
240-
);
233+
lint_for_missing_headers(cx, item.def_id, item.span, sig, headers, Some(body_id), fpu.panic_span);
241234
}
242235
},
243236
hir::ItemKind::Impl(ref impl_) => {
@@ -258,7 +251,7 @@ impl<'tcx> LateLintPass<'tcx> for DocMarkdown {
258251
let headers = check_attrs(cx, &self.valid_idents, attrs);
259252
if let hir::TraitItemKind::Fn(ref sig, ..) = item.kind {
260253
if !in_external_macro(cx.tcx.sess, item.span) {
261-
lint_for_missing_headers(cx, item.hir_id(), item.span, sig, headers, None, None);
254+
lint_for_missing_headers(cx, item.def_id, item.span, sig, headers, None, None);
262255
}
263256
}
264257
}
@@ -277,29 +270,21 @@ impl<'tcx> LateLintPass<'tcx> for DocMarkdown {
277270
panic_span: None,
278271
};
279272
fpu.visit_expr(&body.value);
280-
lint_for_missing_headers(
281-
cx,
282-
item.hir_id(),
283-
item.span,
284-
sig,
285-
headers,
286-
Some(body_id),
287-
fpu.panic_span,
288-
);
273+
lint_for_missing_headers(cx, item.def_id, item.span, sig, headers, Some(body_id), fpu.panic_span);
289274
}
290275
}
291276
}
292277

293278
fn lint_for_missing_headers<'tcx>(
294279
cx: &LateContext<'tcx>,
295-
hir_id: hir::HirId,
280+
def_id: LocalDefId,
296281
span: impl Into<MultiSpan> + Copy,
297282
sig: &hir::FnSig<'_>,
298283
headers: DocHeaders,
299284
body_id: Option<hir::BodyId>,
300285
panic_span: Option<Span>,
301286
) {
302-
if !cx.access_levels.is_exported(hir_id) {
287+
if !cx.access_levels.is_exported(def_id) {
303288
return; // Private functions do not require doc comments
304289
}
305290
if !headers.safety && sig.header.unsafety == hir::Unsafety::Unsafe {
@@ -321,6 +306,7 @@ fn lint_for_missing_headers<'tcx>(
321306
);
322307
}
323308
if !headers.errors {
309+
let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id);
324310
if is_type_diagnostic_item(cx, return_ty(cx, hir_id), sym::result_type) {
325311
span_lint(
326312
cx,

‎clippy_lints/src/enum_variants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl LateLintPass<'_> for EnumVariantNames {
297297
}
298298
}
299299
if let ItemKind::Enum(ref def, _) = item.kind {
300-
if !(self.avoid_breaking_exported_api && cx.access_levels.is_exported(item.hir_id())) {
300+
if !(self.avoid_breaking_exported_api && cx.access_levels.is_exported(item.def_id)) {
301301
check_variant(cx, self.threshold, def, &item_name, item_name_chars, item.span);
302302
}
303303
}

‎clippy_lints/src/exhaustive_items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl LateLintPass<'_> for ExhaustiveItems {
7171
fn check_item(&mut self, cx: &LateContext<'_>, item: &Item<'_>) {
7272
if_chain! {
7373
if let ItemKind::Enum(..) | ItemKind::Struct(..) = item.kind;
74-
if cx.access_levels.is_exported(item.hir_id());
74+
if cx.access_levels.is_exported(item.def_id);
7575
let attrs = cx.tcx.hir().attrs(item.hir_id());
7676
if !attrs.iter().any(|a| a.has_name(sym::non_exhaustive));
7777
then {

‎clippy_lints/src/functions/must_use.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc_ast::ast::Attribute;
22
use rustc_errors::Applicability;
3-
use rustc_hir::def_id::DefIdSet;
3+
use rustc_hir::def_id::{DefIdSet, LocalDefId};
44
use rustc_hir::{self as hir, def::Res, intravisit, QPath};
55
use rustc_lint::{LateContext, LintContext};
66
use rustc_middle::{
@@ -22,7 +22,7 @@ pub(super) fn check_item(cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
2222
let attrs = cx.tcx.hir().attrs(item.hir_id());
2323
let attr = must_use_attr(attrs);
2424
if let hir::ItemKind::Fn(ref sig, ref _generics, ref body_id) = item.kind {
25-
let is_public = cx.access_levels.is_exported(item.hir_id());
25+
let is_public = cx.access_levels.is_exported(item.def_id);
2626
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
2727
if let Some(attr) = attr {
2828
check_needless_must_use(cx, sig.decl, item.hir_id(), item.span, fn_header_span, attr);
@@ -33,7 +33,7 @@ pub(super) fn check_item(cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
3333
sig.decl,
3434
cx.tcx.hir().body(*body_id),
3535
item.span,
36-
item.hir_id(),
36+
item.def_id,
3737
item.span.with_hi(sig.decl.output.span().hi()),
3838
"this function could have a `#[must_use]` attribute",
3939
);
@@ -43,7 +43,7 @@ pub(super) fn check_item(cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
4343

4444
pub(super) fn check_impl_item(cx: &LateContext<'tcx>, item: &'tcx hir::ImplItem<'_>) {
4545
if let hir::ImplItemKind::Fn(ref sig, ref body_id) = item.kind {
46-
let is_public = cx.access_levels.is_exported(item.hir_id());
46+
let is_public = cx.access_levels.is_exported(item.def_id);
4747
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
4848
let attrs = cx.tcx.hir().attrs(item.hir_id());
4949
let attr = must_use_attr(attrs);
@@ -55,7 +55,7 @@ pub(super) fn check_impl_item(cx: &LateContext<'tcx>, item: &'tcx hir::ImplItem<
5555
sig.decl,
5656
cx.tcx.hir().body(*body_id),
5757
item.span,
58-
item.hir_id(),
58+
item.def_id,
5959
item.span.with_hi(sig.decl.output.span().hi()),
6060
"this method could have a `#[must_use]` attribute",
6161
);
@@ -65,7 +65,7 @@ pub(super) fn check_impl_item(cx: &LateContext<'tcx>, item: &'tcx hir::ImplItem<
6565

6666
pub(super) fn check_trait_item(cx: &LateContext<'tcx>, item: &'tcx hir::TraitItem<'_>) {
6767
if let hir::TraitItemKind::Fn(ref sig, ref eid) = item.kind {
68-
let is_public = cx.access_levels.is_exported(item.hir_id());
68+
let is_public = cx.access_levels.is_exported(item.def_id);
6969
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
7070

7171
let attrs = cx.tcx.hir().attrs(item.hir_id());
@@ -80,7 +80,7 @@ pub(super) fn check_trait_item(cx: &LateContext<'tcx>, item: &'tcx hir::TraitIte
8080
sig.decl,
8181
body,
8282
item.span,
83-
item.hir_id(),
83+
item.def_id,
8484
item.span.with_hi(sig.decl.output.span().hi()),
8585
"this method could have a `#[must_use]` attribute",
8686
);
@@ -132,7 +132,7 @@ fn check_must_use_candidate<'tcx>(
132132
decl: &'tcx hir::FnDecl<'_>,
133133
body: &'tcx hir::Body<'_>,
134134
item_span: Span,
135-
item_id: hir::HirId,
135+
item_id: LocalDefId,
136136
fn_span: Span,
137137
msg: &str,
138138
) {
@@ -141,7 +141,7 @@ fn check_must_use_candidate<'tcx>(
141141
|| in_external_macro(cx.sess(), item_span)
142142
|| returns_unit(decl)
143143
|| !cx.access_levels.is_exported(item_id)
144-
|| is_must_use_ty(cx, return_ty(cx, item_id))
144+
|| is_must_use_ty(cx, return_ty(cx, cx.tcx.hir().local_def_id_to_hir_id(item_id)))
145145
{
146146
return;
147147
}

‎clippy_lints/src/functions/not_unsafe_ptr_arg_deref.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use rustc_hir::{self as hir, intravisit, HirIdSet};
22
use rustc_lint::LateContext;
33
use rustc_middle::{hir::map::Map, ty};
4+
use rustc_span::def_id::LocalDefId;
45

56
use clippy_utils::diagnostics::span_lint;
67
use clippy_utils::ty::type_is_unsafe_function;
@@ -21,13 +22,13 @@ pub(super) fn check_fn(
2122
intravisit::FnKind::Closure => return,
2223
};
2324

24-
check_raw_ptr(cx, unsafety, decl, body, hir_id);
25+
check_raw_ptr(cx, unsafety, decl, body, cx.tcx.hir().local_def_id(hir_id));
2526
}
2627

2728
pub(super) fn check_trait_item(cx: &LateContext<'tcx>, item: &'tcx hir::TraitItem<'_>) {
2829
if let hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Provided(eid)) = item.kind {
2930
let body = cx.tcx.hir().body(eid);
30-
check_raw_ptr(cx, sig.header.unsafety, sig.decl, body, item.hir_id());
31+
check_raw_ptr(cx, sig.header.unsafety, sig.decl, body, item.def_id);
3132
}
3233
}
3334

@@ -36,10 +37,10 @@ fn check_raw_ptr(
3637
unsafety: hir::Unsafety,
3738
decl: &'tcx hir::FnDecl<'tcx>,
3839
body: &'tcx hir::Body<'tcx>,
39-
hir_id: hir::HirId,
40+
def_id: LocalDefId,
4041
) {
4142
let expr = &body.value;
42-
if unsafety == hir::Unsafety::Normal && cx.access_levels.is_exported(hir_id) {
43+
if unsafety == hir::Unsafety::Normal && cx.access_levels.is_exported(def_id) {
4344
let raw_ptrs = iter_input_pats(decl, body)
4445
.zip(decl.inputs.iter())
4546
.filter_map(|(arg, ty)| raw_ptr_arg(arg, ty))

‎clippy_lints/src/functions/result_unit_err.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use super::RESULT_UNIT_ERR;
1515

1616
pub(super) fn check_item(cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
1717
if let hir::ItemKind::Fn(ref sig, ref _generics, _) = item.kind {
18-
let is_public = cx.access_levels.is_exported(item.hir_id());
18+
let is_public = cx.access_levels.is_exported(item.def_id);
1919
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
2020
if is_public {
2121
check_result_unit_err(cx, sig.decl, item.span, fn_header_span);
@@ -25,7 +25,7 @@ pub(super) fn check_item(cx: &LateContext<'tcx>, item: &'tcx hir::Item<'_>) {
2525

2626
pub(super) fn check_impl_item(cx: &LateContext<'tcx>, item: &'tcx hir::ImplItem<'_>) {
2727
if let hir::ImplItemKind::Fn(ref sig, _) = item.kind {
28-
let is_public = cx.access_levels.is_exported(item.hir_id());
28+
let is_public = cx.access_levels.is_exported(item.def_id);
2929
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
3030
if is_public && trait_ref_of_method(cx, item.hir_id()).is_none() {
3131
check_result_unit_err(cx, sig.decl, item.span, fn_header_span);
@@ -35,7 +35,7 @@ pub(super) fn check_impl_item(cx: &LateContext<'tcx>, item: &'tcx hir::ImplItem<
3535

3636
pub(super) fn check_trait_item(cx: &LateContext<'tcx>, item: &'tcx hir::TraitItem<'_>) {
3737
if let hir::TraitItemKind::Fn(ref sig, _) = item.kind {
38-
let is_public = cx.access_levels.is_exported(item.hir_id());
38+
let is_public = cx.access_levels.is_exported(item.def_id);
3939
let fn_header_span = item.span.with_hi(sig.decl.output.span().hi());
4040
if is_public {
4141
check_result_unit_err(cx, sig.decl, item.span, fn_header_span);

‎clippy_lints/src/implicit_hasher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl<'tcx> LateLintPass<'tcx> for ImplicitHasher {
112112
}
113113
}
114114

115-
if !cx.access_levels.is_exported(item.hir_id()) {
115+
if !cx.access_levels.is_exported(item.def_id) {
116116
return;
117117
}
118118

‎clippy_lints/src/len_zero.rs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl<'tcx> LateLintPass<'tcx> for LenZero {
131131
if item.ident.name == sym::len;
132132
if let ImplItemKind::Fn(sig, _) = &item.kind;
133133
if sig.decl.implicit_self.has_implicit_self();
134-
if cx.access_levels.is_exported(item.hir_id());
134+
if cx.access_levels.is_exported(item.def_id);
135135
if matches!(sig.decl.output, FnRetTy::Return(_));
136136
if let Some(imp) = get_parent_as_impl(cx.tcx, item.hir_id());
137137
if imp.of_trait.is_none();
@@ -207,8 +207,7 @@ fn check_trait_items(cx: &LateContext<'_>, visited_trait: &Item<'_>, trait_items
207207
}
208208
}
209209

210-
if cx.access_levels.is_exported(visited_trait.hir_id())
211-
&& trait_items.iter().any(|i| is_named_self(cx, i, sym::len))
210+
if cx.access_levels.is_exported(visited_trait.def_id) && trait_items.iter().any(|i| is_named_self(cx, i, sym::len))
212211
{
213212
let mut current_and_super_traits = DefIdSet::default();
214213
fill_trait_set(visited_trait.def_id.to_def_id(), &mut current_and_super_traits, cx);
@@ -331,21 +330,15 @@ fn check_for_is_empty(
331330
None,
332331
None,
333332
),
334-
Some(is_empty)
335-
if !cx
336-
.access_levels
337-
.is_exported(cx.tcx.hir().local_def_id_to_hir_id(is_empty.def_id.expect_local())) =>
338-
{
339-
(
340-
format!(
341-
"{} `{}` has a public `len` method, but a private `is_empty` method",
342-
item_kind,
343-
item_name.as_str(),
344-
),
345-
Some(cx.tcx.def_span(is_empty.def_id)),
346-
None,
347-
)
348-
},
333+
Some(is_empty) if !cx.access_levels.is_exported(is_empty.def_id.expect_local()) => (
334+
format!(
335+
"{} `{}` has a public `len` method, but a private `is_empty` method",
336+
item_kind,
337+
item_name.as_str(),
338+
),
339+
Some(cx.tcx.def_span(is_empty.def_id)),
340+
None,
341+
),
349342
Some(is_empty)
350343
if !(is_empty.fn_has_self_parameter
351344
&& check_is_empty_sig(cx.tcx.fn_sig(is_empty.def_id).skip_binder(), self_kind, output)) =>

‎clippy_lints/src/methods/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,7 @@ impl<'tcx> LateLintPass<'tcx> for Methods {
19301930

19311931
then {
19321932
// if this impl block implements a trait, lint in trait definition instead
1933-
if !implements_trait && cx.access_levels.is_exported(impl_item.hir_id()) {
1933+
if !implements_trait && cx.access_levels.is_exported(impl_item.def_id) {
19341934
// check missing trait implementations
19351935
for method_config in &TRAIT_METHODS {
19361936
if name == method_config.method_name &&
@@ -1962,7 +1962,7 @@ impl<'tcx> LateLintPass<'tcx> for Methods {
19621962

19631963
if sig.decl.implicit_self.has_implicit_self()
19641964
&& !(self.avoid_breaking_exported_api
1965-
&& cx.access_levels.is_exported(impl_item.hir_id()))
1965+
&& cx.access_levels.is_exported(impl_item.def_id))
19661966
{
19671967
wrong_self_convention::check(
19681968
cx,

‎clippy_lints/src/missing_inline.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
8787
return;
8888
}
8989

90-
if !cx.access_levels.is_exported(it.hir_id()) {
90+
if !cx.access_levels.is_exported(it.def_id) {
9191
return;
9292
}
9393
match it.kind {
@@ -140,7 +140,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
140140
}
141141

142142
// If the item being implemented is not exported, then we don't need #[inline]
143-
if !cx.access_levels.is_exported(impl_item.hir_id()) {
143+
if !cx.access_levels.is_exported(impl_item.def_id) {
144144
return;
145145
}
146146

@@ -155,7 +155,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
155155
};
156156

157157
if let Some(trait_def_id) = trait_def_id {
158-
if trait_def_id.is_local() && !cx.access_levels.is_exported(impl_item.hir_id()) {
158+
if trait_def_id.is_local() && !cx.access_levels.is_exported(impl_item.def_id) {
159159
// If a trait is being implemented for an item, and the
160160
// trait is not exported, we don't need #[inline]
161161
return;

‎clippy_lints/src/new_without_default.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl<'tcx> LateLintPass<'tcx> for NewWithoutDefault {
9999
if_chain! {
100100
if sig.decl.inputs.is_empty();
101101
if name == sym::new;
102-
if cx.access_levels.is_reachable(id);
102+
if cx.access_levels.is_reachable(impl_item.def_id);
103103
let self_def_id = cx.tcx.hir().local_def_id(cx.tcx.hir().get_parent_item(id));
104104
let self_ty = cx.tcx.type_of(self_def_id);
105105
if TyS::same_type(self_ty, return_ty(cx, id));

0 commit comments

Comments
 (0)