Skip to content

Store #[stable] attribute's since value in structured form #117148

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 7 commits into from
Oct 26, 2023
Merged

Store #[stable] attribute's since value in structured form #117148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f2ae7b5
Store 'since' attribute as parsed Version
dtolnay Oct 24, 2023
ddcb183
Keep track of #[stable] attribute even if version cannot be parsed
dtolnay Oct 24, 2023
7b0e315
Update stability attribute sanity UI test to delete superfluous errors
dtolnay Oct 24, 2023
6933a67
Handle structured stable attribute 'since' version in rustdoc
dtolnay Oct 24, 2023
fd8907f
Handle structured stable attribute 'since' version in clippy
dtolnay Oct 25, 2023
51f7fba
CFG_RELEASE is mandatory, no need for option_env
dtolnay Oct 25, 2023
1a9ea1f
Expose a non-Symbol way to access current rustc version string
dtolnay Oct 25, 2023
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
18 changes: 11 additions & 7 deletions compiler/rustc_attr/src/builtin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ pub enum Since {
Version(Version),
/// Stabilized in the upcoming version, whatever number that is.
Current,
/// Failed to parse a stabilization version.
Err,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this hold an ErrorGuaranteed or not useful?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I based this on the ExprKind::Err from rustc_ast, which does not hold ErrorGuaranteed.

rust/compiler/rustc_ast/src/ast.rs

Lines 1494 to 1495 in 964ff01

/// Placeholder for an expression that wasn't syntactically well formed in some way.
Err,

}

impl StabilityLevel {
Expand Down Expand Up @@ -381,22 +383,24 @@ fn parse_stability(sess: &Session, attr: &Attribute) -> Option<(Symbol, Stabilit

let since = if let Some(since) = since {
if since.as_str() == VERSION_PLACEHOLDER {
Ok(Since::Current)
Since::Current
} else if let Some(version) = parse_version(since.as_str(), false) {
Ok(Since::Version(version))
Since::Version(version)
} else {
Err(sess.emit_err(session_diagnostics::InvalidSince { span: attr.span }))
sess.emit_err(session_diagnostics::InvalidSince { span: attr.span });
Since::Err
}
} else {
Err(sess.emit_err(session_diagnostics::MissingSince { span: attr.span }))
sess.emit_err(session_diagnostics::MissingSince { span: attr.span });
Since::Err
};

match (feature, since) {
(Ok(feature), Ok(since)) => {
match feature {
Ok(feature) => {
let level = StabilityLevel::Stable { since, allowed_through_unstable_modules: false };
Some((feature, level))
}
(Err(ErrorGuaranteed { .. }), _) | (_, Err(ErrorGuaranteed { .. })) => None,
Err(ErrorGuaranteed { .. }) => None,
}
}

Expand Down
4 changes: 4 additions & 0 deletions compiler/rustc_passes/src/stability.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,10 @@ impl<'a, 'tcx> Annotator<'a, 'tcx> {
}
}
}
Since::Err => {
// An error already reported. Assume the unparseable stabilization
// version is older than the deprecation version.
}
}
}

Expand Down