Skip to content

Commit 7c50b97

Browse files
committed
Remove unstable cfg target(...) compact feature from RFC3239
1 parent 9fa0146 commit 7c50b97

13 files changed

+3
-211
lines changed

Diff for: compiler/rustc_attr/messages.ftl

-3
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ attr_unknown_meta_item =
107107
attr_unknown_version_literal =
108108
unknown version literal format, assuming it refers to a future version
109109
110-
attr_unstable_cfg_target_compact =
111-
compact `cfg(target(..))` is experimental and subject to change
112-
113110
attr_unsupported_literal_cfg_boolean =
114111
literal in `cfg` predicate value must be a boolean
115112
attr_unsupported_literal_cfg_string =

Diff for: compiler/rustc_attr/src/builtin.rs

-34
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use rustc_span::hygiene::Transparency;
2020
use rustc_span::symbol::{Symbol, kw, sym};
2121
use rustc_span::{DUMMY_SP, Span};
2222

23-
use crate::fluent_generated;
2423
use crate::session_diagnostics::{self, IncorrectReprFormatGenericCause};
2524

2625
/// The version placeholder that recently stabilized features contain inside the
@@ -773,39 +772,6 @@ pub fn eval_condition(
773772

774773
!eval_condition(mi, sess, features, eval)
775774
}
776-
sym::target => {
777-
if let Some(features) = features
778-
&& !features.cfg_target_compact()
779-
{
780-
feature_err(
781-
sess,
782-
sym::cfg_target_compact,
783-
cfg.span,
784-
fluent_generated::attr_unstable_cfg_target_compact,
785-
)
786-
.emit();
787-
}
788-
789-
mis.iter().fold(true, |res, mi| {
790-
let Some(mut mi) = mi.meta_item().cloned() else {
791-
dcx.emit_err(session_diagnostics::CfgPredicateIdentifier {
792-
span: mi.span(),
793-
});
794-
return false;
795-
};
796-
797-
if let [seg, ..] = &mut mi.path.segments[..] {
798-
seg.ident.name = Symbol::intern(&format!("target_{}", seg.ident.name));
799-
}
800-
801-
res & eval_condition(
802-
&ast::MetaItemInner::MetaItem(mi),
803-
sess,
804-
features,
805-
eval,
806-
)
807-
})
808-
}
809775
_ => {
810776
dcx.emit_err(session_diagnostics::InvalidPredicate {
811777
span: cfg.span,

Diff for: compiler/rustc_feature/src/removed.rs

+3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ declare_features! (
5252
(removed, box_syntax, "1.70.0", Some(49733), Some("replaced with `#[rustc_box]`")),
5353
/// Allows capturing disjoint fields in a closure/coroutine (RFC 2229).
5454
(removed, capture_disjoint_fields, "1.49.0", Some(53488), Some("stabilized in Rust 2021")),
55+
/// Allows `cfg(target(abi = "..."))`.
56+
(removed, cfg_target_compact, "CURRENT_RUSTC_VERSION", Some(96901),
57+
Some("removed due to lack of usefulness and users")),
5558
/// Allows comparing raw pointers during const eval.
5659
(removed, const_compare_raw_pointers, "1.46.0", Some(53020),
5760
Some("cannot be allowed in const eval in any meaningful way")),

Diff for: compiler/rustc_feature/src/unstable.rs

-2
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,6 @@ declare_features! (
399399
(unstable, cfg_sanitize, "1.41.0", Some(39699)),
400400
/// Allows `cfg(sanitizer_cfi_generalize_pointers)` and `cfg(sanitizer_cfi_normalize_integers)`.
401401
(unstable, cfg_sanitizer_cfi, "1.77.0", Some(89653)),
402-
/// Allows `cfg(target(abi = "..."))`.
403-
(unstable, cfg_target_compact, "1.63.0", Some(96901)),
404402
/// Allows `cfg(target_has_atomic_load_store = "...")`.
405403
(unstable, cfg_target_has_atomic, "1.60.0", Some(94039)),
406404
/// Allows `cfg(target_has_atomic_equal_alignment = "...")`.

Diff for: tests/ui/cfg/cfg-target-compact-errors.rs

-21
This file was deleted.

Diff for: tests/ui/cfg/cfg-target-compact-errors.stderr

-28
This file was deleted.

Diff for: tests/ui/cfg/cfg-target-compact.rs

-10
This file was deleted.

Diff for: tests/ui/check-cfg/compact-names.rs

-16
This file was deleted.

Diff for: tests/ui/check-cfg/compact-names.stderr

-13
This file was deleted.

Diff for: tests/ui/check-cfg/compact-values.rs

-16
This file was deleted.

Diff for: tests/ui/check-cfg/compact-values.stderr

-12
This file was deleted.

Diff for: tests/ui/feature-gates/feature-gate-cfg-target-compact.rs

-13
This file was deleted.

Diff for: tests/ui/feature-gates/feature-gate-cfg-target-compact.stderr

-43
This file was deleted.

0 commit comments

Comments
 (0)