Skip to content

Commit 07a4b7e

Browse files
borsbors
committed
Auto merge of rust-lang#116773 - dtolnay:validatestable, r=compiler-errors
Validate `feature` and `since` values inside `#[stable(…)]` Previously the string passed to `#[unstable(feature = "...")]` would be validated as an identifier, but not `#[stable(feature = "...")]`. In the standard library there were `stable` attributes containing the empty string, and kebab-case string, neither of which should be allowed. Pre-existing validation of `unstable`: ```rust // src/lib.rs #![allow(internal_features)] #![feature(staged_api)] #![unstable(feature = "kebab-case", issue = "none")] #[unstable(feature = "kebab-case", issue = "none")] pub struct Struct; ``` ```console error[E0546]: 'feature' is not an identifier --> src/lib.rs:5:1 | 5 | #![unstable(feature = "kebab-case", issue = "none")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ``` For an `unstable` attribute, the need for an identifier is obvious because the downstream code needs to write a `#![feature(...)]` attribute containing that identifier. `#![feature(kebab-case)]` is not valid syntax and `#![feature(kebab_case)]` would not work if that is not the name of the feature. Having a valid identifier even in `stable` is less essential but still useful because it allows for informative diagnostic about the stabilization of a feature. Compare: ```rust // src/lib.rs #![allow(internal_features)] #![feature(staged_api)] #![stable(feature = "kebab-case", since = "1.0.0")] #[stable(feature = "kebab-case", since = "1.0.0")] pub struct Struct; ``` ```rust // src/main.rs #![feature(kebab_case)] use repro::Struct; fn main() {} ``` ```console error[E0635]: unknown feature `kebab_case` --> src/main.rs:3:12 | 3 | #![feature(kebab_case)] | ^^^^^^^^^^ ``` vs the situation if we correctly use `feature = "snake_case"` and `#![feature(snake_case)]`, as enforced by this PR: ```console warning: the feature `snake_case` has been stable since 1.0.0 and no longer requires an attribute to enable --> src/main.rs:3:12 | 3 | #![feature(snake_case)] | ^^^^^^^^^^ | = note: `#[warn(stable_features)]` on by default ```
2 parents 642bfb2 + 6a02e20 commit 07a4b7e

23 files changed

+138
-110
lines changed

Diff for: ‎compiler/rustc_attr/messages.ftl

+3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ attr_invalid_repr_hint_no_paren =
5858
attr_invalid_repr_hint_no_value =
5959
invalid representation hint: `{$name}` does not take a value
6060
61+
attr_invalid_since =
62+
'since' must be a Rust version number, such as "1.31.0"
63+
6164
attr_missing_feature =
6265
missing 'feature'
6366

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

+36-28
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
use rustc_ast::{self as ast, attr};
44
use rustc_ast::{Attribute, LitKind, MetaItem, MetaItemKind, MetaItemLit, NestedMetaItem, NodeId};
55
use rustc_ast_pretty::pprust;
6+
use rustc_errors::ErrorGuaranteed;
67
use rustc_feature::{find_gated_cfg, is_builtin_attr_name, Features, GatedCfg};
78
use rustc_macros::HashStable_Generic;
89
use rustc_session::config::ExpectedValues;
@@ -361,25 +362,32 @@ fn parse_stability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabilit
361362
}
362363
}
363364

364-
if let Some(s) = since
365-
&& s.as_str() == VERSION_PLACEHOLDER
366-
{
367-
since = Some(rust_version_symbol());
368-
}
365+
let feature = match feature {
366+
Some(feature) if rustc_lexer::is_ident(feature.as_str()) => Ok(feature),
367+
Some(_bad_feature) => {
368+
Err(sess.emit_err(session_diagnostics::NonIdentFeature { span: attr.span }))
369+
}
370+
None => Err(sess.emit_err(session_diagnostics::MissingFeature { span: attr.span })),
371+
};
372+
373+
let since = if let Some(since) = since {
374+
if since.as_str() == VERSION_PLACEHOLDER {
375+
Ok(rust_version_symbol())
376+
} else if parse_version(since.as_str(), false).is_some() {
377+
Ok(since)
378+
} else {
379+
Err(sess.emit_err(session_diagnostics::InvalidSince { span: attr.span }))
380+
}
381+
} else {
382+
Err(sess.emit_err(session_diagnostics::MissingSince { span: attr.span }))
383+
};
369384

370385
match (feature, since) {
371-
(Some(feature), Some(since)) => {
386+
(Ok(feature), Ok(since)) => {
372387
let level = StabilityLevel::Stable { since, allowed_through_unstable_modules: false };
373388
Some((feature, level))
374389
}
375-
(None, _) => {
376-
sess.emit_err(session_diagnostics::MissingFeature { span: attr.span });
377-
None
378-
}
379-
_ => {
380-
sess.emit_err(session_diagnostics::MissingSince { span: attr.span });
381-
None
382-
}
390+
(Err(ErrorGuaranteed { .. }), _) | (_, Err(ErrorGuaranteed { .. })) => None,
383391
}
384392
}
385393

@@ -451,12 +459,19 @@ fn parse_unstability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabil
451459
}
452460
}
453461

454-
match (feature, reason, issue) {
455-
(Some(feature), reason, Some(_)) => {
456-
if !rustc_lexer::is_ident(feature.as_str()) {
457-
sess.emit_err(session_diagnostics::NonIdentFeature { span: attr.span });
458-
return None;
459-
}
462+
let feature = match feature {
463+
Some(feature) if rustc_lexer::is_ident(feature.as_str()) => Ok(feature),
464+
Some(_bad_feature) => {
465+
Err(sess.emit_err(session_diagnostics::NonIdentFeature { span: attr.span }))
466+
}
467+
None => Err(sess.emit_err(session_diagnostics::MissingFeature { span: attr.span })),
468+
};
469+
470+
let issue =
471+
issue.ok_or_else(|| sess.emit_err(session_diagnostics::MissingIssue { span: attr.span }));
472+
473+
match (feature, issue) {
474+
(Ok(feature), Ok(_)) => {
460475
let level = StabilityLevel::Unstable {
461476
reason: UnstableReason::from_opt_reason(reason),
462477
issue: issue_num,
@@ -465,14 +480,7 @@ fn parse_unstability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabil
465480
};
466481
Some((feature, level))
467482
}
468-
(None, _, _) => {
469-
sess.emit_err(session_diagnostics::MissingFeature { span: attr.span });
470-
return None;
471-
}
472-
_ => {
473-
sess.emit_err(session_diagnostics::MissingIssue { span: attr.span });
474-
return None;
475-
}
483+
(Err(ErrorGuaranteed { .. }), _) | (_, Err(ErrorGuaranteed { .. })) => None,
476484
}
477485
}
478486

Diff for: ‎compiler/rustc_attr/src/session_diagnostics.rs

+7
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,13 @@ pub(crate) struct ExpectsFeatures {
370370
pub name: String,
371371
}
372372

373+
#[derive(Diagnostic)]
374+
#[diag(attr_invalid_since)]
375+
pub(crate) struct InvalidSince {
376+
#[primary_span]
377+
pub span: Span,
378+
}
379+
373380
#[derive(Diagnostic)]
374381
#[diag(attr_soft_no_args)]
375382
pub(crate) struct SoftNoArgs {

Diff for: ‎library/core/src/ffi/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! match those defined by C, so that code that interacts with C will
77
//! refer to the correct types.
88
9-
#![stable(feature = "", since = "1.30.0")]
9+
#![stable(feature = "core_ffi", since = "1.30.0")]
1010
#![allow(non_camel_case_types)]
1111

1212
use crate::fmt;

Diff for: ‎library/std/src/io/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1140,10 +1140,10 @@ pub fn read_to_string<R: Read>(mut reader: R) -> Result<String> {
11401140
#[repr(transparent)]
11411141
pub struct IoSliceMut<'a>(sys::io::IoSliceMut<'a>);
11421142

1143-
#[stable(feature = "iovec-send-sync", since = "1.44.0")]
1143+
#[stable(feature = "iovec_send_sync", since = "1.44.0")]
11441144
unsafe impl<'a> Send for IoSliceMut<'a> {}
11451145

1146-
#[stable(feature = "iovec-send-sync", since = "1.44.0")]
1146+
#[stable(feature = "iovec_send_sync", since = "1.44.0")]
11471147
unsafe impl<'a> Sync for IoSliceMut<'a> {}
11481148

11491149
#[stable(feature = "iovec", since = "1.36.0")]
@@ -1283,10 +1283,10 @@ impl<'a> DerefMut for IoSliceMut<'a> {
12831283
#[repr(transparent)]
12841284
pub struct IoSlice<'a>(sys::io::IoSlice<'a>);
12851285

1286-
#[stable(feature = "iovec-send-sync", since = "1.44.0")]
1286+
#[stable(feature = "iovec_send_sync", since = "1.44.0")]
12871287
unsafe impl<'a> Send for IoSlice<'a> {}
12881288

1289-
#[stable(feature = "iovec-send-sync", since = "1.44.0")]
1289+
#[stable(feature = "iovec_send_sync", since = "1.44.0")]
12901290
unsafe impl<'a> Sync for IoSlice<'a> {}
12911291

12921292
#[stable(feature = "iovec", since = "1.36.0")]

Diff for: ‎src/tools/clippy/tests/ui/missing_const_for_fn/auxiliary/helper.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// This file provides a const function that is unstably const forever.
22

33
#![feature(staged_api)]
4-
#![stable(feature = "1", since = "1.0.0")]
4+
#![stable(feature = "clippytest", since = "1.0.0")]
55

6-
#[stable(feature = "1", since = "1.0.0")]
6+
#[stable(feature = "clippytest", since = "1.0.0")]
77
#[rustc_const_unstable(feature = "foo", issue = "none")]
88
pub const fn unstably_const_fn() {}

Diff for: ‎tests/rustdoc/deprecated-future-staged-api.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#![feature(staged_api)]
2-
#![stable(feature = "deprecated-future-staged-api", since = "1.0.0")]
2+
#![stable(feature = "deprecated_future_staged_api", since = "1.0.0")]
33

44
// @has deprecated_future_staged_api/index.html '//*[@class="stab deprecated"]' \
55
// 'Deprecation planned'
66
// @has deprecated_future_staged_api/struct.S1.html '//*[@class="stab deprecated"]' \
77
// 'Deprecating in 99.99.99: effectively never'
88
#[deprecated(since = "99.99.99", note = "effectively never")]
9-
#[stable(feature = "deprecated-future-staged-api", since = "1.0.0")]
9+
#[stable(feature = "deprecated_future_staged_api", since = "1.0.0")]
1010
pub struct S1;
1111

1212
// @has deprecated_future_staged_api/index.html '//*[@class="stab deprecated"]' \
1313
// 'Deprecation planned'
1414
// @has deprecated_future_staged_api/struct.S2.html '//*[@class="stab deprecated"]' \
1515
// 'Deprecating in a future Rust version: literally never'
1616
#[deprecated(since = "TBD", note = "literally never")]
17-
#[stable(feature = "deprecated-future-staged-api", since = "1.0.0")]
17+
#[stable(feature = "deprecated_future_staged_api", since = "1.0.0")]
1818
pub struct S2;

Diff for: ‎tests/rustdoc/implementor-stable-version.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
#![stable(feature = "bar", since = "OLD 1.0")]
1+
#![stable(feature = "bar", since = "3.3.3")]
22
#![crate_name = "foo"]
33

44
#![feature(staged_api)]
55

6-
#[stable(feature = "bar", since = "OLD 1.0")]
6+
#[stable(feature = "bar", since = "3.3.3")]
77
pub trait Bar {}
88

9-
#[stable(feature = "baz", since = "OLD 1.0")]
9+
#[stable(feature = "baz", since = "3.3.3")]
1010
pub trait Baz {}
1111

12-
#[stable(feature = "baz", since = "OLD 1.0")]
12+
#[stable(feature = "baz", since = "3.3.3")]
1313
pub struct Foo;
1414

15-
// @has foo/trait.Bar.html '//div[@id="implementors-list"]//span[@class="since"]' 'NEW 2.0'
16-
#[stable(feature = "foobar", since = "NEW 2.0")]
15+
// @has foo/trait.Bar.html '//div[@id="implementors-list"]//span[@class="since"]' '4.4.4'
16+
#[stable(feature = "foobar", since = "4.4.4")]
1717
impl Bar for Foo {}
1818

19-
// @!has foo/trait.Baz.html '//div[@id="implementors-list"]//span[@class="since"]' 'OLD 1.0'
20-
#[stable(feature = "foobaz", since = "OLD 1.0")]
19+
// @!has foo/trait.Baz.html '//div[@id="implementors-list"]//span[@class="since"]' '3.3.3'
20+
#[stable(feature = "foobaz", since = "3.3.3")]
2121
impl Baz for Foo {}

Diff for: ‎tests/ui/attributes/const-stability-on-macro.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(staged_api)]
22
#![stable(feature = "rust1", since = "1.0.0")]
33

4-
#[rustc_const_stable(feature = "foo", since = "0")]
4+
#[rustc_const_stable(feature = "foo", since = "3.3.3")]
55
//~^ ERROR macros cannot have const stability attributes
66
macro_rules! foo {
77
() => {};

Diff for: ‎tests/ui/attributes/const-stability-on-macro.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: macros cannot have const stability attributes
22
--> $DIR/const-stability-on-macro.rs:4:1
33
|
4-
LL | #[rustc_const_stable(feature = "foo", since = "0")]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid const stability attribute
4+
LL | #[rustc_const_stable(feature = "foo", since = "3.3.3")]
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid const stability attribute
66
LL |
77
LL | macro_rules! foo {
88
| ---------------- const stability attribute affects this macro

Diff for: ‎tests/ui/const-generics/defaults/default-annotation.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
// FIXME(const_generics_defaults): It seems like we aren't testing the right thing here,
55
// I would assume that we want the attributes to apply to the const parameter defaults
66
// themselves.
7-
#![stable(feature = "const_default_test", since="none")]
7+
#![stable(feature = "const_default_test", since = "3.3.3")]
88

9-
#[unstable(feature = "const_default_stable", issue="none")]
9+
#[unstable(feature = "const_default_stable", issue = "none")]
1010
pub struct ConstDefaultUnstable<const N: usize = 3>;
1111

12-
#[stable(feature = "const_default_unstable", since="none")]
12+
#[stable(feature = "const_default_unstable", since = "3.3.3")]
1313
pub struct ConstDefaultStable<const N: usize = {
1414
3
1515
}>;

Diff for: ‎tests/ui/deprecation/staged-deprecation-in-future.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
#![feature(staged_api)]
44

5-
#![stable(feature = "rustc_deprecation-in-future-test", since = "1.0.0")]
5+
#![stable(feature = "rustc_deprecation_in_future_test", since = "1.0.0")]
66

77
#[deprecated(since = "99.99.99", note = "effectively never")]
8-
#[stable(feature = "rustc_deprecation-in-future-test", since = "1.0.0")]
8+
#[stable(feature = "rustc_deprecation_in_future_test", since = "1.0.0")]
99
pub struct S1;
1010

1111
#[deprecated(since = "TBD", note = "literally never")]
12-
#[stable(feature = "rustc_deprecation-in-future-test", since = "1.0.0")]
12+
#[stable(feature = "rustc_deprecation_in_future_test", since = "1.0.0")]
1313
pub struct S2;
1414

1515
fn main() {

Diff for: ‎tests/ui/feature-gates/feature-gate-staged_api.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#![stable(feature = "a", since = "b")]
1+
#![stable(feature = "a", since = "3.3.3")]
22
//~^ ERROR stability attributes may not be used outside of the standard library
33
mod inner_private_module {
44
// UnnameableTypeAlias isn't marked as reachable, so no stability annotation is required here
55
pub type UnnameableTypeAlias = u8;
66
}
77

8-
#[stable(feature = "a", since = "b")]
8+
#[stable(feature = "a", since = "3.3.3")]
99
//~^ ERROR stability attributes may not be used outside of the standard library
1010
pub fn f() -> inner_private_module::UnnameableTypeAlias {
1111
0

Diff for: ‎tests/ui/feature-gates/feature-gate-staged_api.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error[E0734]: stability attributes may not be used outside of the standard library
22
--> $DIR/feature-gate-staged_api.rs:8:1
33
|
4-
LL | #[stable(feature = "a", since = "b")]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
LL | #[stable(feature = "a", since = "3.3.3")]
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error[E0734]: stability attributes may not be used outside of the standard library
88
--> $DIR/feature-gate-staged_api.rs:1:1
99
|
10-
LL | #![stable(feature = "a", since = "b")]
11-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10+
LL | #![stable(feature = "a", since = "3.3.3")]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212

1313
error: aborting due to 2 previous errors
1414

Diff for: ‎tests/ui/reachable/reachable-unnameable-type-alias.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// run-pass
22

33
#![feature(staged_api)]
4-
#![stable(feature = "a", since = "b")]
4+
#![stable(feature = "a", since = "3.3.3")]
55

66
mod inner_private_module {
77
// UnnameableTypeAlias isn't marked as reachable, so no stability annotation is required here
88
pub type UnnameableTypeAlias = u8;
99
}
1010

11-
#[stable(feature = "a", since = "b")]
11+
#[stable(feature = "a", since = "3.3.3")]
1212
pub fn f() -> inner_private_module::UnnameableTypeAlias {
1313
0
1414
}

Diff for: ‎tests/ui/repr/16-bit-repr-c-enum.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#![feature(no_core, lang_items, intrinsics, staged_api, rustc_attrs)]
99
#![no_core]
1010
#![crate_type = "lib"]
11-
#![stable(feature = "", since = "")]
11+
#![stable(feature = "intrinsics_for_test", since = "3.3.3")]
1212
#![allow(dead_code)]
1313

1414
// Test that the repr(C) attribute doesn't break compilation
@@ -22,8 +22,8 @@ enum Foo {
2222
}
2323

2424
extern "rust-intrinsic" {
25-
#[stable(feature = "", since = "")]
26-
#[rustc_const_stable(feature = "", since = "")]
25+
#[stable(feature = "intrinsics_for_test", since = "3.3.3")]
26+
#[rustc_const_stable(feature = "intrinsics_for_test", since = "3.3.3")]
2727
#[rustc_safe_intrinsic]
2828
fn size_of<T>() -> usize;
2929
}

Diff for: ‎tests/ui/rfcs/rfc-2632-const-trait-impl/default-method-body-is-const-with-staged-api.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#![feature(staged_api)]
99
#![feature(const_trait_impl)]
10-
#![stable(since = "1", feature = "foo")]
10+
#![stable(feature = "foo", since = "3.3.3")]
1111

1212
#[const_trait]
1313
trait Tr {

Diff for: ‎tests/ui/stability-attribute/stability-attribute-issue-43027.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// check-pass
22
#![feature(staged_api)]
3-
#![stable(feature = "test", since = "0")]
3+
#![stable(feature = "test", since = "3.3.3")]
44

5-
#[stable(feature = "test", since = "0")]
5+
#[stable(feature = "test", since = "3.3.3")]
66
pub struct A<T>(pub T);
77

8-
#[stable(feature = "test", since = "0")]
9-
pub struct B<T>(#[stable(feature = "test", since = "0")] pub T);
8+
#[stable(feature = "test", since = "3.3.3")]
9+
pub struct B<T>(#[stable(feature = "test", since = "3.3.3")] pub T);
1010

1111
fn main() {
1212
// Make sure the field is used to fill the stability cache

Diff for: ‎tests/ui/stability-attribute/stability-attribute-sanity-4.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ mod bogus_attribute_types_2 {
1717
#[stable = "a"] //~ ERROR malformed `stable` attribute
1818
fn f4() { }
1919

20-
#[stable(feature = "a", since = "b")]
20+
#[stable(feature = "a", since = "3.3.3")]
2121
#[deprecated] //~ ERROR missing 'since'
2222
fn f5() { }
2323

24-
#[stable(feature = "a", since = "b")]
24+
#[stable(feature = "a", since = "3.3.3")]
2525
#[deprecated = "a"] //~ ERROR missing 'since'
2626
fn f6() { }
2727
}

0 commit comments

Comments
 (0)