Validate since value in stable attribute

Author: dtolnay

compiler/rustc_attr/messages.ftl

@@ -58,6 +58,9 @@ attr_invalid_repr_hint_no_paren =
 attr_invalid_repr_hint_no_value =
     invalid representation hint: `{$name}` does not take a value
 
+attr_invalid_since =
+    'since' must be a Rust version number, such as "1.31.0"
+
 attr_missing_feature =
     missing 'feature'
 

compiler/rustc_attr/src/builtin.rs

@@ -36,6 +36,7 @@ enum AttrError {
     MultipleItem(String),
     UnknownMetaItem(String, &'static [&'static str]),
     MissingSince,
+    InvalidSince,
     NonIdentFeature,
     MissingFeature,
     MultipleStabilityLevels,
@@ -58,6 +59,7 @@ fn handle_errors(sess: &ParseSess, span: Span, error: AttrError) -> ErrorGuarant
             sess.emit_err(session_diagnostics::UnknownMetaItem { span, item, expected })
         }
         AttrError::MissingSince => sess.emit_err(session_diagnostics::MissingSince { span }),
+        AttrError::InvalidSince => sess.emit_err(session_diagnostics::InvalidSince { span }),
         AttrError::NonIdentFeature => sess.emit_err(session_diagnostics::NonIdentFeature { span }),
         AttrError::MissingFeature => sess.emit_err(session_diagnostics::MissingFeature { span }),
         AttrError::MultipleStabilityLevels => {
@@ -400,12 +402,6 @@ fn parse_stability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabilit
         }
     }
 
-    if let Some(s) = since
-        && s.as_str() == VERSION_PLACEHOLDER
-    {
-        since = Some(rust_version_symbol());
-    }
-
     let feature = match feature {
         Some(feature) if rustc_lexer::is_ident(feature.as_str()) => Ok(feature),
         Some(_bad_feature) => {
@@ -414,8 +410,17 @@ fn parse_stability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabilit
         None => Err(handle_errors(&sess.parse_sess, attr.span, AttrError::MissingFeature)),
     };
 
-    let since =
-        since.ok_or_else(|| handle_errors(&sess.parse_sess, attr.span, AttrError::MissingSince));
+    let since = if let Some(since) = since {
+        if since.as_str() == VERSION_PLACEHOLDER {
+            Ok(rust_version_symbol())
+        } else if parse_version(since.as_str(), false).is_some() {
+            Ok(since)
+        } else {
+            Err(handle_errors(&sess.parse_sess, attr.span, AttrError::InvalidSince))
+        }
+    } else {
+        Err(handle_errors(&sess.parse_sess, attr.span, AttrError::MissingSince))
+    };
 
     match (feature, since) {
         (Ok(feature), Ok(since)) => {

compiler/rustc_attr/src/session_diagnostics.rs

@@ -370,6 +370,13 @@ pub(crate) struct ExpectsFeatures {
     pub name: String,
 }
 
+#[derive(Diagnostic)]
+#[diag(attr_invalid_since)]
+pub(crate) struct InvalidSince {
+    #[primary_span]
+    pub span: Span,
+}
+
 #[derive(Diagnostic)]
 #[diag(attr_soft_no_args)]
 pub(crate) struct SoftNoArgs {