Skip to content

Do not emit the lint unused_attributes for *inherent* #[doc(hidden)] associated items #97208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2022
Merged

Do not emit the lint unused_attributes for *inherent* #[doc(hidden)] associated items #97208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_passes/src/check_attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ impl CheckAttrVisitor<'_> {
let parent_hir_id = self.tcx.hir().get_parent_item(hir_id);
let containing_item = self.tcx.hir().expect_item(parent_hir_id);

if Target::from_item(containing_item) == Target::Impl {
if let hir::ItemKind::Impl(hir::Impl { of_trait: Some(_), .. }) = containing_item.kind {
let meta_items = attr.meta_item_list().unwrap();

let (span, replacement_span) = if meta_items.len() == 1 {
Expand Down
15 changes: 14 additions & 1 deletion src/test/ui/lint/unused/unused-attr-doc-hidden.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![deny(unused_attributes)]
#![feature(inherent_associated_types)]
#![allow(dead_code, incomplete_features)]
#![crate_type = "lib"]
#![deny(unused_attributes)]
// run-rustfix

pub trait Trait {
Expand All @@ -12,6 +14,17 @@ pub trait Trait {

pub struct Implementor;

impl Implementor {
#[doc(hidden)] // no error
type Inh = ();

#[doc(hidden)] // no error
const INH: () = ();

#[doc(hidden)] // no error
fn inh() {}
}

impl Trait for Implementor {

type It = ();
Expand Down
15 changes: 14 additions & 1 deletion src/test/ui/lint/unused/unused-attr-doc-hidden.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![deny(unused_attributes)]
#![feature(inherent_associated_types)]
#![allow(dead_code, incomplete_features)]
#![crate_type = "lib"]
#![deny(unused_attributes)]
// run-rustfix

pub trait Trait {
Expand All @@ -12,6 +14,17 @@ pub trait Trait {

pub struct Implementor;

impl Implementor {
#[doc(hidden)] // no error
type Inh = ();

#[doc(hidden)] // no error
const INH: () = ();

#[doc(hidden)] // no error
fn inh() {}
}

impl Trait for Implementor {
#[doc(hidden)]
type It = ();
Expand Down
14 changes: 7 additions & 7 deletions src/test/ui/lint/unused/unused-attr-doc-hidden.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
error: `#[doc(hidden)]` is ignored on trait impl items
--> $DIR/unused-attr-doc-hidden.rs:16:5
--> $DIR/unused-attr-doc-hidden.rs:29:5
|
LL | #[doc(hidden)]
| ^^^^^^^^^^^^^^ help: remove this attribute
|
note: the lint level is defined here
--> $DIR/unused-attr-doc-hidden.rs:1:9
--> $DIR/unused-attr-doc-hidden.rs:4:9
|
LL | #![deny(unused_attributes)]
| ^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= note: whether the impl item is `doc(hidden)` or not entirely depends on the corresponding trait item

error: `#[doc(hidden)]` is ignored on trait impl items
--> $DIR/unused-attr-doc-hidden.rs:21:5
--> $DIR/unused-attr-doc-hidden.rs:34:5
|
LL | #[doc(hidden)]
| ^^^^^^^^^^^^^^ help: remove this attribute
Expand All @@ -22,7 +22,7 @@ LL | #[doc(hidden)]
= note: whether the impl item is `doc(hidden)` or not entirely depends on the corresponding trait item

error: `#[doc(hidden)]` is ignored on trait impl items
--> $DIR/unused-attr-doc-hidden.rs:26:11
--> $DIR/unused-attr-doc-hidden.rs:39:11
|
LL | #[doc(hidden, alias = "aka")]
| ^^^^^^--
Expand All @@ -33,7 +33,7 @@ LL | #[doc(hidden, alias = "aka")]
= note: whether the impl item is `doc(hidden)` or not entirely depends on the corresponding trait item

error: `#[doc(hidden)]` is ignored on trait impl items
--> $DIR/unused-attr-doc-hidden.rs:31:27
--> $DIR/unused-attr-doc-hidden.rs:44:27
|
LL | #[doc(alias = "this", hidden,)]
| ^^^^^^-
Expand All @@ -44,7 +44,7 @@ LL | #[doc(alias = "this", hidden,)]
= note: whether the impl item is `doc(hidden)` or not entirely depends on the corresponding trait item

error: `#[doc(hidden)]` is ignored on trait impl items
--> $DIR/unused-attr-doc-hidden.rs:36:11
--> $DIR/unused-attr-doc-hidden.rs:49:11
|
LL | #[doc(hidden, hidden)]
| ^^^^^^--
Expand All @@ -55,7 +55,7 @@ LL | #[doc(hidden, hidden)]
= note: whether the impl item is `doc(hidden)` or not entirely depends on the corresponding trait item

error: `#[doc(hidden)]` is ignored on trait impl items
--> $DIR/unused-attr-doc-hidden.rs:36:19
--> $DIR/unused-attr-doc-hidden.rs:49:19
|
LL | #[doc(hidden, hidden)]
| ^^^^^^ help: remove this attribute
Expand Down