Skip to content

Commit 99cf574

Browse files
compiler-errorscompiler-errors
committed
Revert "Rollup merge of rust-lang#126618 - mu001999-contrib:dead/enhance, r=pnkfelix"
This reverts commit 2724aea, reversing changes made to d929a42.
1 parent 8acacfe commit 99cf574

File tree

9 files changed

+36
-75
lines changed

9 files changed

+36
-75
lines changed

‎compiler/rustc_passes/src/dead.rs

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,7 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
156156

157157
fn handle_res(&mut self, res: Res) {
158158
match res {
159-
Res::Def(
160-
DefKind::Const | DefKind::AssocConst | DefKind::AssocTy | DefKind::TyAlias,
161-
def_id,
162-
) => {
159+
Res::Def(DefKind::Const | DefKind::AssocConst | DefKind::TyAlias, def_id) => {
163160
self.check_def_id(def_id);
164161
}
165162
_ if self.in_pat => {}
@@ -445,7 +442,7 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
445442
intravisit::walk_item(self, item)
446443
}
447444
hir::ItemKind::ForeignMod { .. } => {}
448-
hir::ItemKind::Trait(_, _, _, _, trait_item_refs) => {
445+
hir::ItemKind::Trait(..) => {
449446
for impl_def_id in self.tcx.all_impls(item.owner_id.to_def_id()) {
450447
if let Some(local_def_id) = impl_def_id.as_local()
451448
&& let ItemKind::Impl(impl_ref) =
@@ -458,12 +455,7 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
458455
intravisit::walk_path(self, impl_ref.of_trait.unwrap().path);
459456
}
460457
}
461-
// mark assoc ty live if the trait is live
462-
for trait_item in trait_item_refs {
463-
if let hir::AssocItemKind::Type = trait_item.kind {
464-
self.check_def_id(trait_item.id.owner_id.to_def_id());
465-
}
466-
}
458+
467459
intravisit::walk_item(self, item)
468460
}
469461
_ => intravisit::walk_item(self, item),
@@ -480,8 +472,9 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
480472
&& let ItemKind::Impl(impl_ref) =
481473
self.tcx.hir().expect_item(local_impl_id).kind
482474
{
483-
if !ty_ref_to_pub_struct(self.tcx, impl_ref.self_ty)
484-
.ty_and_all_fields_are_public
475+
if !matches!(trait_item.kind, hir::TraitItemKind::Type(..))
476+
&& !ty_ref_to_pub_struct(self.tcx, impl_ref.self_ty)
477+
.ty_and_all_fields_are_public
485478
{
486479
// skip impl-items of non pure pub ty,
487480
// cause we don't know the ty is constructed or not,
@@ -820,8 +813,9 @@ fn check_item<'tcx>(
820813
// for trait impl blocks,
821814
// mark the method live if the self_ty is public,
822815
// or the method is public and may construct self
823-
if tcx.visibility(local_def_id).is_public()
824-
&& (ty_and_all_fields_are_public || may_construct_self)
816+
if of_trait && matches!(tcx.def_kind(local_def_id), DefKind::AssocTy)
817+
|| tcx.visibility(local_def_id).is_public()
818+
&& (ty_and_all_fields_are_public || may_construct_self)
825819
{
826820
// if the impl item is public,
827821
// and the ty may be constructed or can be constructed in foreign crates,
@@ -858,13 +852,10 @@ fn check_trait_item(
858852
worklist: &mut Vec<(LocalDefId, ComesFromAllowExpect)>,
859853
id: hir::TraitItemId,
860854
) {
861-
use hir::TraitItemKind::{Const, Fn, Type};
862-
if matches!(
863-
tcx.def_kind(id.owner_id),
864-
DefKind::AssocConst | DefKind::AssocTy | DefKind::AssocFn
865-
) {
855+
use hir::TraitItemKind::{Const, Fn};
856+
if matches!(tcx.def_kind(id.owner_id), DefKind::AssocConst | DefKind::AssocFn) {
866857
let trait_item = tcx.hir().trait_item(id);
867-
if matches!(trait_item.kind, Const(_, Some(_)) | Type(_, Some(_)) | Fn(..))
858+
if matches!(trait_item.kind, Const(_, Some(_)) | Fn(..))
868859
&& let Some(comes_from_allow) =
869860
has_allow_dead_code_or_lang_attr(tcx, trait_item.owner_id.def_id)
870861
{
@@ -906,7 +897,7 @@ fn create_and_seed_worklist(
906897
// checks impls, impl-items and pub structs with all public fields later
907898
match tcx.def_kind(id) {
908899
DefKind::Impl { .. } => false,
909-
DefKind::AssocConst | DefKind::AssocTy | DefKind::AssocFn => !matches!(tcx.associated_item(id).container, AssocItemContainer::ImplContainer),
900+
DefKind::AssocConst | DefKind::AssocFn => !matches!(tcx.associated_item(id).container, AssocItemContainer::ImplContainer),
910901
DefKind::Struct => struct_all_fields_are_public(tcx, id.to_def_id()) || has_allow_dead_code_or_lang_attr(tcx, id).is_some(),
911902
_ => true
912903
})
@@ -1193,7 +1184,6 @@ impl<'tcx> DeadVisitor<'tcx> {
11931184
}
11941185
match self.tcx.def_kind(def_id) {
11951186
DefKind::AssocConst
1196-
| DefKind::AssocTy
11971187
| DefKind::AssocFn
11981188
| DefKind::Fn
11991189
| DefKind::Static { .. }
@@ -1235,14 +1225,15 @@ fn check_mod_deathness(tcx: TyCtxt<'_>, module: LocalModDefId) {
12351225
|| (def_kind == DefKind::Trait && live_symbols.contains(&item.owner_id.def_id))
12361226
{
12371227
for &def_id in tcx.associated_item_def_ids(item.owner_id.def_id) {
1238-
// We have diagnosed unused assocs in traits
1228+
// We have diagnosed unused assoc consts and fns in traits
12391229
if matches!(def_kind, DefKind::Impl { of_trait: true })
1240-
&& matches!(tcx.def_kind(def_id), DefKind::AssocConst | DefKind::AssocTy | DefKind::AssocFn)
1230+
&& matches!(tcx.def_kind(def_id), DefKind::AssocConst | DefKind::AssocFn)
12411231
// skip unused public inherent methods,
12421232
// cause we have diagnosed unconstructed struct
12431233
|| matches!(def_kind, DefKind::Impl { of_trait: false })
12441234
&& tcx.visibility(def_id).is_public()
12451235
&& ty_ref_to_pub_struct(tcx, tcx.hir().item(item).expect_impl().self_ty).ty_is_public
1236+
|| def_kind == DefKind::Trait && tcx.def_kind(def_id) == DefKind::AssocTy
12461237
{
12471238
continue;
12481239
}

‎tests/ui/const-generics/cross_crate_complex.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ async fn foo() {
1111
async_in_foo(async_out_foo::<4>().await).await;
1212
}
1313

14-
#[allow(dead_code)]
1514
struct Faz<const N: usize>;
1615

1716
impl<const N: usize> Foo<N> for Faz<N> {}

‎tests/ui/generic-associated-types/missing-bounds.fixed

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
use std::ops::Add;
44

5-
#[allow(dead_code)]
65
struct A<B>(B);
76

87
impl<B> Add for A<B> where B: Add<Output = B> {
@@ -13,7 +12,6 @@ impl<B> Add for A<B> where B: Add<Output = B> {
1312
}
1413
}
1514

16-
#[allow(dead_code)]
1715
struct C<B>(B);
1816

1917
impl<B: Add<Output = B>> Add for C<B> {
@@ -24,7 +22,6 @@ impl<B: Add<Output = B>> Add for C<B> {
2422
}
2523
}
2624

27-
#[allow(dead_code)]
2825
struct D<B>(B);
2926

3027
impl<B: std::ops::Add<Output = B>> Add for D<B> {
@@ -35,7 +32,6 @@ impl<B: std::ops::Add<Output = B>> Add for D<B> {
3532
}
3633
}
3734

38-
#[allow(dead_code)]
3935
struct E<B>(B);
4036

4137
impl<B: Add<Output = B>> Add for E<B> where B: Add<Output = B> {

‎tests/ui/generic-associated-types/missing-bounds.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
use std::ops::Add;
44

5-
#[allow(dead_code)]
65
struct A<B>(B);
76

87
impl<B> Add for A<B> where B: Add {
@@ -13,7 +12,6 @@ impl<B> Add for A<B> where B: Add {
1312
}
1413
}
1514

16-
#[allow(dead_code)]
1715
struct C<B>(B);
1816

1917
impl<B: Add> Add for C<B> {
@@ -24,7 +22,6 @@ impl<B: Add> Add for C<B> {
2422
}
2523
}
2624

27-
#[allow(dead_code)]
2825
struct D<B>(B);
2926

3027
impl<B> Add for D<B> {
@@ -35,7 +32,6 @@ impl<B> Add for D<B> {
3532
}
3633
}
3734

38-
#[allow(dead_code)]
3935
struct E<B>(B);
4036

4137
impl<B: Add> Add for E<B> where <B as Add>::Output = B {

‎tests/ui/generic-associated-types/missing-bounds.stderr

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: equality constraints are not yet supported in `where` clauses
2-
--> $DIR/missing-bounds.rs:41:33
2+
--> $DIR/missing-bounds.rs:37:33
33
|
44
LL | impl<B: Add> Add for E<B> where <B as Add>::Output = B {
55
| ^^^^^^^^^^^^^^^^^^^^^^ not supported
@@ -11,7 +11,7 @@ LL | impl<B: Add> Add for E<B> where B: Add<Output = B> {
1111
| ~~~~~~~~~~~~~~~~~~
1212

1313
error[E0308]: mismatched types
14-
--> $DIR/missing-bounds.rs:12:11
14+
--> $DIR/missing-bounds.rs:11:11
1515
|
1616
LL | impl<B> Add for A<B> where B: Add {
1717
| - expected this type parameter
@@ -24,14 +24,14 @@ LL | A(self.0 + rhs.0)
2424
= note: expected type parameter `B`
2525
found associated type `<B as Add>::Output`
2626
help: the type constructed contains `<B as Add>::Output` due to the type of the argument passed
27-
--> $DIR/missing-bounds.rs:12:9
27+
--> $DIR/missing-bounds.rs:11:9
2828
|
2929
LL | A(self.0 + rhs.0)
3030
| ^^--------------^
3131
| |
3232
| this argument influences the type of `A`
3333
note: tuple struct defined here
34-
--> $DIR/missing-bounds.rs:6:8
34+
--> $DIR/missing-bounds.rs:5:8
3535
|
3636
LL | struct A<B>(B);
3737
| ^
@@ -41,7 +41,7 @@ LL | impl<B> Add for A<B> where B: Add<Output = B> {
4141
| ++++++++++++
4242

4343
error[E0308]: mismatched types
44-
--> $DIR/missing-bounds.rs:23:14
44+
--> $DIR/missing-bounds.rs:21:14
4545
|
4646
LL | impl<B: Add> Add for C<B> {
4747
| - expected this type parameter
@@ -54,7 +54,7 @@ LL | Self(self.0 + rhs.0)
5454
= note: expected type parameter `B`
5555
found associated type `<B as Add>::Output`
5656
note: tuple struct defined here
57-
--> $DIR/missing-bounds.rs:17:8
57+
--> $DIR/missing-bounds.rs:15:8
5858
|
5959
LL | struct C<B>(B);
6060
| ^
@@ -64,7 +64,7 @@ LL | impl<B: Add<Output = B>> Add for C<B> {
6464
| ++++++++++++
6565

6666
error[E0369]: cannot add `B` to `B`
67-
--> $DIR/missing-bounds.rs:34:21
67+
--> $DIR/missing-bounds.rs:31:21
6868
|
6969
LL | Self(self.0 + rhs.0)
7070
| ------ ^ ----- B
@@ -77,7 +77,7 @@ LL | impl<B: std::ops::Add<Output = B>> Add for D<B> {
7777
| +++++++++++++++++++++++++++
7878

7979
error[E0308]: mismatched types
80-
--> $DIR/missing-bounds.rs:46:14
80+
--> $DIR/missing-bounds.rs:42:14
8181
|
8282
LL | impl<B: Add> Add for E<B> where <B as Add>::Output = B {
8383
| - expected this type parameter
@@ -90,7 +90,7 @@ LL | Self(self.0 + rhs.0)
9090
= note: expected type parameter `B`
9191
found associated type `<B as Add>::Output`
9292
note: tuple struct defined here
93-
--> $DIR/missing-bounds.rs:39:8
93+
--> $DIR/missing-bounds.rs:35:8
9494
|
9595
LL | struct E<B>(B);
9696
| ^

‎tests/ui/lint/dead-code/unused-trait-with-assoc-ty.rs

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎tests/ui/lint/dead-code/unused-trait-with-assoc-ty.stderr

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎tests/ui/pattern/issue-22546.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ impl<T: ::std::fmt::Display> Foo<T> {
1515
}
1616
}
1717

18-
trait Tr {
18+
trait Tr { //~ WARN trait `Tr` is never used
1919
type U;
2020
}
2121

‎tests/ui/pattern/issue-22546.stderr

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
warning: trait `Tr` is never used
2+
--> $DIR/issue-22546.rs:18:7
3+
|
4+
LL | trait Tr {
5+
| ^^
6+
|
7+
= note: `#[warn(dead_code)]` on by default
8+
9+
warning: 1 warning emitted
10+

0 commit comments

Comments
 (0)