nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-17 01:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

dead-code-lint: de-dup multiple unused assoc fns

Browse Source
This commit is contained in:
Ezra Shaw 2023-04-13 22:42:47 +12:00
parent 03cf0e949f
commit c41dcac8e8
No known key found for this signature in database
GPG Key ID: 67ABF16FB0ECD870
8 changed files with 77 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
compiler/rustc_passes/src/dead.rs
View File

@ -712,12 +712,12 @@ impl<'tcx> DeadVisitor<'tcx> {
let parent_info = if let Some(parent_item) = parent_item {
let parent_descr = tcx.def_descr(parent_item.to_def_id());
Some(ParentInfo {
num,
descr,
parent_descr,
span: tcx.def_ident_span(parent_item).unwrap(),
})
let span = if let DefKind::Impl { .. } = tcx.def_kind(parent_item) {
tcx.def_span(parent_item)
} else {
tcx.def_ident_span(parent_item).unwrap()
};
Some(ParentInfo { num, descr, parent_descr, span })
} else {
None
};
@ -800,16 +800,7 @@ impl<'tcx> DeadVisitor<'tcx> {
}
fn check_definition(&mut self, def_id: LocalDefId) {
if self.live_symbols.contains(&def_id) {
return;
}
if has_allow_dead_code_or_lang_attr(self.tcx, def_id) {
return;
}
let Some(name) = self.tcx.opt_item_name(def_id.to_def_id()) else {
return
};
if name.as_str().starts_with('_') {
if self.is_live_code(def_id) {
return;
}
match self.tcx.def_kind(def_id) {
@ -827,6 +818,18 @@ impl<'tcx> DeadVisitor<'tcx> {
_ => {}
}
}
fn is_live_code(&self, def_id: LocalDefId) -> bool {
// if we cannot get a name for the item, then we just assume that it is
// live. I mean, we can't really emit a lint.
let Some(name) = self.tcx.opt_item_name(def_id.to_def_id()) else {
return true;
};
self.live_symbols.contains(&def_id)
|| has_allow_dead_code_or_lang_attr(self.tcx, def_id)
|| name.as_str().starts_with('_')
}
}
fn check_mod_deathness(tcx: TyCtxt<'_>, module: LocalDefId) {
@ -837,9 +840,26 @@ fn check_mod_deathness(tcx: TyCtxt<'_>, module: LocalDefId) {
for item in module_items.items() {
if let hir::ItemKind::Impl(impl_item) = tcx.hir().item(item).kind {
let mut dead_items = Vec::new();
for item in impl_item.items {
visitor.check_definition(item.id.owner_id.def_id);
match item.kind {
hir::AssocItemKind::Const | hir::AssocItemKind::Type => {
visitor.check_definition(item.id.owner_id.def_id)
}
hir::AssocItemKind::Fn { .. } => {
let did = item.id.owner_id.def_id;
if !visitor.is_live_code(did) {
dead_items.push(did)
}
}
}
}
visitor.warn_multiple_dead_codes(
&dead_items,
"used",
Some(item.owner_id.def_id),
false,
);
continue;
}

12
tests/ui/lint/dead-code/issue-85255.rs
View File

@ -11,8 +11,8 @@ struct Foo {
struct Bar;
impl Bar {
fn a(&self) -> i32 { 5 } //~ WARNING: method `a` is never used
pub fn b(&self) -> i32 { 6 } //~ WARNING: method `b` is never used
fn a(&self) -> i32 { 5 } //~ WARNING: methods `a` and `b` are never used [dead_code]
pub fn b(&self) -> i32 { 6 }
}
pub(crate) struct Foo1 {
@ -23,8 +23,8 @@ pub(crate) struct Foo1 {
pub(crate) struct Bar1;
impl Bar1 {
fn a(&self) -> i32 { 5 } //~ WARNING: method `a` is never used
pub fn b(&self) -> i32 { 6 } //~ WARNING: method `b` is never used
fn a(&self) -> i32 { 5 } //~ WARNING: methods `a` and `b` are never used [dead_code]
pub fn b(&self) -> i32 { 6 }
}
pub(crate) struct Foo2 {
@ -35,8 +35,8 @@ pub(crate) struct Foo2 {
pub(crate) struct Bar2;
impl Bar2 {
fn a(&self) -> i32 { 5 } //~ WARNING: method `a` is never used
pub fn b(&self) -> i32 { 6 } //~ WARNING: method `b` is never used
fn a(&self) -> i32 { 5 } //~ WARNING: methods `a` and `b` are never used [dead_code]
pub fn b(&self) -> i32 { 6 }
}

26
tests/ui/lint/dead-code/issue-85255.stderr
View File

@ -14,15 +14,13 @@ note: the lint level is defined here
LL | #![warn(dead_code)]
| ^^^^^^^^^
warning: method `a` is never used
warning: methods `a` and `b` are never used
--> $DIR/issue-85255.rs:14:8
|
LL | impl Bar {
| -------- methods in this implementation
LL | fn a(&self) -> i32 { 5 }
| ^
warning: method `b` is never used
--> $DIR/issue-85255.rs:15:12
|
LL | pub fn b(&self) -> i32 { 6 }
| ^
@ -36,15 +34,13 @@ LL | a: i32,
LL | pub b: i32,
| ^
warning: method `a` is never used
warning: methods `a` and `b` are never used
--> $DIR/issue-85255.rs:26:8
|
LL | impl Bar1 {
| --------- methods in this implementation
LL | fn a(&self) -> i32 { 5 }
| ^
warning: method `b` is never used
--> $DIR/issue-85255.rs:27:12
|
LL | pub fn b(&self) -> i32 { 6 }
| ^
@ -58,17 +54,15 @@ LL | a: i32,
LL | pub b: i32,
| ^
warning: method `a` is never used
warning: methods `a` and `b` are never used
--> $DIR/issue-85255.rs:38:8
|
LL | impl Bar2 {
| --------- methods in this implementation
LL | fn a(&self) -> i32 { 5 }
| ^
warning: method `b` is never used
--> $DIR/issue-85255.rs:39:12
|
LL | pub fn b(&self) -> i32 { 6 }
| ^
warning: 9 warnings emitted
warning: 6 warnings emitted

2
tests/ui/lint/dead-code/lint-dead-code-3.stderr
View File

@ -13,6 +13,8 @@ LL | #![deny(dead_code)]
error: method `foo` is never used
--> $DIR/lint-dead-code-3.rs:16:8
|
LL | impl Foo {
| -------- method in this implementation
LL | fn foo(&self) {
| ^^^

9
tests/ui/lint/dead-code/lint-dead-code-6.rs
View File

@ -2,17 +2,16 @@
struct UnusedStruct; //~ ERROR struct `UnusedStruct` is never constructed
impl UnusedStruct {
fn unused_impl_fn_1() { //~ ERROR associated function `unused_impl_fn_1` is never used
fn unused_impl_fn_1() {
//~^ ERROR associated functions `unused_impl_fn_1`, `unused_impl_fn_2`, and `unused_impl_fn_3` are never used [dead_code]
println!("blah");
}
fn unused_impl_fn_2(var: i32) { //~ ERROR associated function `unused_impl_fn_2` is never used
fn unused_impl_fn_2(var: i32) {
println!("foo {}", var);
}
fn unused_impl_fn_3( //~ ERROR associated function `unused_impl_fn_3` is never used
var: i32,
) {
fn unused_impl_fn_3(var: i32) {
println!("bar {}", var);
}
}

18
tests/ui/lint/dead-code/lint-dead-code-6.stderr
View File

@ -10,23 +10,19 @@ note: the lint level is defined here
LL | #![deny(dead_code)]
| ^^^^^^^^^
error: associated function `unused_impl_fn_1` is never used
error: associated functions `unused_impl_fn_1`, `unused_impl_fn_2`, and `unused_impl_fn_3` are never used
--> $DIR/lint-dead-code-6.rs:5:8
|
LL | impl UnusedStruct {
| ----------------- associated functions in this implementation
LL | fn unused_impl_fn_1() {
| ^^^^^^^^^^^^^^^^
error: associated function `unused_impl_fn_2` is never used
--> $DIR/lint-dead-code-6.rs:9:8
|
...
LL | fn unused_impl_fn_2(var: i32) {
| ^^^^^^^^^^^^^^^^
error: associated function `unused_impl_fn_3` is never used
--> $DIR/lint-dead-code-6.rs:13:8
|
LL | fn unused_impl_fn_3(
...
LL | fn unused_impl_fn_3(var: i32) {
| ^^^^^^^^^^^^^^^^
error: aborting due to 4 previous errors
error: aborting due to 2 previous errors

4
tests/ui/lint/dead-code/unused-assoc-fns.rs
View File

@ -4,10 +4,9 @@ struct Foo;
impl Foo {
fn one() {}
//~^ ERROR associated function `one` is never used [dead_code]
//~^ ERROR associated functions `one`, `two`, and `three` are never used [dead_code]
fn two(&self) {}
//~^ ERROR method `two` is never used [dead_code]
// seperation between functions
// ...
@ -16,7 +15,6 @@ impl Foo {
fn used() {}
fn three(&self) {
//~^ ERROR method `three` is never used [dead_code]
Foo::one();
// ...
}

24
tests/ui/lint/dead-code/unused-assoc-fns.stderr
View File

@ -1,8 +1,16 @@
error: associated function `one` is never used
error: associated functions `one`, `two`, and `three` are never used
--> $DIR/unused-assoc-fns.rs:6:8
|
LL | impl Foo {
| -------- associated functions in this implementation
LL | fn one() {}
| ^^^
...
LL | fn two(&self) {}
| ^^^
...
LL | fn three(&self) {
| ^^^^^
|
note: the lint level is defined here
--> $DIR/unused-assoc-fns.rs:1:9
@ -11,17 +19,5 @@ LL | #![deny(unused)]
| ^^^^^^
= note: `#[deny(dead_code)]` implied by `#[deny(unused)]`
error: method `two` is never used
--> $DIR/unused-assoc-fns.rs:9:8
|
LL | fn two(&self) {}
| ^^^
error: method `three` is never used
--> $DIR/unused-assoc-fns.rs:18:8
|
LL | fn three(&self) {
| ^^^^^
error: aborting due to 3 previous errors
error: aborting due to previous error