Skip to content

Commit 349c4bf

Browse files
committed
Auto merge of #152856 - bjorn3:remove_no_link_attr, r=<try>
[DO NOT MERGE] Remove #[no_link] attribute
2 parents 0ee5907 + 8a562fd commit 349c4bf

27 files changed

Lines changed: 46 additions & 288 deletions

File tree

compiler/rustc_attr_parsing/src/attributes/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ pub(crate) mod macro_attrs;
5252
pub(crate) mod must_not_suspend;
5353
pub(crate) mod must_use;
5454
pub(crate) mod no_implicit_prelude;
55-
pub(crate) mod no_link;
5655
pub(crate) mod non_exhaustive;
5756
pub(crate) mod path;
5857
pub(crate) mod pin_v2;

compiler/rustc_attr_parsing/src/attributes/no_link.rs

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

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ use crate::attributes::macro_attrs::*;
4141
use crate::attributes::must_not_suspend::*;
4242
use crate::attributes::must_use::*;
4343
use crate::attributes::no_implicit_prelude::*;
44-
use crate::attributes::no_link::*;
4544
use crate::attributes::non_exhaustive::*;
4645
use crate::attributes::path::PathParser as PathAttributeParser;
4746
use crate::attributes::pin_v2::*;
@@ -254,7 +253,6 @@ attribute_parsers!(
254253
Single<WithoutArgs<NoBuiltinsParser>>,
255254
Single<WithoutArgs<NoCoreParser>>,
256255
Single<WithoutArgs<NoImplicitPreludeParser>>,
257-
Single<WithoutArgs<NoLinkParser>>,
258256
Single<WithoutArgs<NoMainParser>>,
259257
Single<WithoutArgs<NoMangleParser>>,
260258
Single<WithoutArgs<NoStdParser>>,

compiler/rustc_feature/src/builtin_attrs.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -628,11 +628,6 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
628628
template!(NameValueStr: "name", "https://doc.rust-lang.org/reference/items/external-blocks.html#the-link_name-attribute"),
629629
FutureWarnPreceding, EncodeCrossCrate::Yes
630630
),
631-
ungated!(
632-
no_link, Normal,
633-
template!(Word, "https://doc.rust-lang.org/reference/items/extern-crates.html#the-no_link-attribute"),
634-
WarnFollowing, EncodeCrossCrate::No
635-
),
636631
ungated!(
637632
repr, Normal,
638633
template!(

compiler/rustc_hir/src/attrs/data_structures.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,9 +1158,6 @@ pub enum AttributeKind {
11581158
/// Represents `#[no_implicit_prelude]`
11591159
NoImplicitPrelude(Span),
11601160

1161-
/// Represents `#[no_link]`
1162-
NoLink,
1163-
11641161
/// Represents `#[no_main]`
11651162
NoMain,
11661163

compiler/rustc_hir/src/attrs/encode_cross_crate.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ impl AttributeKind {
7171
NoBuiltins => Yes,
7272
NoCore(..) => No,
7373
NoImplicitPrelude(..) => No,
74-
NoLink => No,
7574
NoMain => No,
7675
NoMangle(..) => Yes, // Needed for rustdoc
7776
NoStd(..) => No,

compiler/rustc_metadata/src/creader.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,11 +1283,7 @@ impl CStore {
12831283
}
12841284
None => ident.name,
12851285
};
1286-
let dep_kind = if attr::contains_name(&item.attrs, sym::no_link) {
1287-
CrateDepKind::MacrosOnly
1288-
} else {
1289-
CrateDepKind::Unconditional
1290-
};
1286+
let dep_kind = CrateDepKind::Unconditional;
12911287

12921288
let cnum =
12931289
self.resolve_crate(tcx, name, item.span, dep_kind, CrateOrigin::Extern)?;

compiler/rustc_passes/src/check_attr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
275275
| AttributeKind::NoBuiltins
276276
| AttributeKind::NoCore { .. }
277277
| AttributeKind::NoImplicitPrelude(..)
278-
| AttributeKind::NoLink
279278
| AttributeKind::NoMain
280279
| AttributeKind::NoMangle(..)
281280
| AttributeKind::NoStd { .. }

src/tools/clippy/clippy_lints/src/empty_line_after.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ impl Stop {
157157
sym::must_use |
158158
// Should be applied to a foreign function or static
159159
sym::link_name | sym::link_ordinal | sym::link_section |
160-
// Should be applied to an `extern crate` item
161-
sym::no_link |
162160
// Should be applied to a free function, impl method or static
163161
sym::export_name | sym::no_mangle |
164162
// Should be applied to a `static` variable

src/tools/rust-analyzer/crates/hir-expand/src/inert_attr_macro.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ pub const INERT_ATTRIBUTES: &[BuiltinAttribute] = &[
188188
DuplicatesOk,
189189
),
190190
ungated!(link_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
191-
ungated!(no_link, Normal, template!(Word), WarnFollowing),
192191
ungated!(repr, Normal, template!(List: "C"), DuplicatesOk, @only_local: true),
193192
ungated!(export_name, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),
194193
ungated!(link_section, Normal, template!(NameValueStr: "name"), FutureWarnPreceding),

0 commit comments

Comments
 (0)