Skip to content
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.

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

Support multiple stability attributes on items #131824

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3338,6 +3338,7 @@ dependencies = [
"rustc_serialize",
"rustc_session",
"rustc_span",
"smallvec",
]

[[package]]
Expand Down Expand Up @@ -3511,6 +3512,7 @@ dependencies = [
"rustc_target",
"rustc_trait_selection",
"rustc_type_ir",
"smallvec",
"tracing",
]

Expand Down Expand Up @@ -4228,6 +4230,7 @@ dependencies = [
"rustc_span",
"rustc_target",
"rustc_trait_selection",
"smallvec",
"tracing",
]

Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_attr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ rustc_macros = { path = "../rustc_macros" }
rustc_serialize = { path = "../rustc_serialize" }
rustc_session = { path = "../rustc_session" }
rustc_span = { path = "../rustc_span" }
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
# tidy-alphabetical-end
8 changes: 7 additions & 1 deletion compiler/rustc_attr/messages.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ attr_multiple_item =
multiple '{$item}' items

attr_multiple_stability_levels =
multiple stability levels
multiple stability levels for feature `{$feature}`

attr_multiple_unstable_reasons =
multiple reasons provided for unstability

attr_non_ident_feature =
'feature' is not an identifier
Expand All @@ -97,6 +100,9 @@ attr_rustc_const_stable_indirect_pairing =
attr_rustc_promotable_pairing =
`rustc_promotable` attribute must be paired with either a `rustc_const_unstable` or a `rustc_const_stable` attribute

attr_soft_inconsistent =
`soft` must be present on either none or all of an item's `unstable` attributes

attr_soft_no_args =
`soft` should not have any arguments

Expand Down
Loading
Loading