diff options
| author | bors <bors@rust-lang.org> | 2021-04-28 05:52:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-28 05:52:47 +0000 |
| commit | 855c2d130fb70da1643cf8f696c7aad7537aef34 (patch) | |
| tree | 41829a9612ab210fc11b74691bd783c44190db85 /compiler/rustc_feature | |
| parent | 537544b1061467ee4b74ef7f552fab3d513e5caf (diff) | |
| parent | 83767d97f0ac4e644340792dd7209bbcd9306647 (diff) | |
| download | rust-855c2d130fb70da1643cf8f696c7aad7537aef34.tar.gz rust-855c2d130fb70da1643cf8f696c7aad7537aef34.zip | |
Auto merge of #83713 - spastorino:revert-pub-macro-rules, r=nikomatsakis
Revert "Rollup merge of #82296 - spastorino:pubrules, r=nikomatsakis" This reverts commit e2561c58a41023a14e0e583113dcf55e1ecb236a, reversing changes made to 2982ba50fc4bb629b8fe4108a81cb2f9b053510b. As discussed in #83641 this feature is not complete and in particular doesn't work cross macros and given that this is not going to be included in edition 2021 nobody seems to be trying to fix the underlying problem. When can add this again I guess, whenever somebody has the time to make it work cross crates. r? `@nikomatsakis`
Diffstat (limited to 'compiler/rustc_feature')
| -rw-r--r-- | compiler/rustc_feature/src/active.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_feature/src/removed.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_feature/src/active.rs b/compiler/rustc_feature/src/active.rs index 7ae7e0094c6..304d7ede625 100644 --- a/compiler/rustc_feature/src/active.rs +++ b/compiler/rustc_feature/src/active.rs @@ -628,9 +628,6 @@ declare_features! ( /// Allows macro attributes to observe output of `#[derive]`. (active, macro_attributes_in_derive_output, "1.51.0", Some(81119), None), - /// Allows `pub` on `macro_rules` items. - (active, pub_macro_rules, "1.52.0", Some(78855), None), - /// Allows the use of type alias impl trait in function return positions (active, min_type_alias_impl_trait, "1.52.0", Some(63063), None), diff --git a/compiler/rustc_feature/src/removed.rs b/compiler/rustc_feature/src/removed.rs index c2ad339ed41..fa8ef182aed 100644 --- a/compiler/rustc_feature/src/removed.rs +++ b/compiler/rustc_feature/src/removed.rs @@ -134,6 +134,8 @@ declare_features! ( which is available from cargo build scripts with `cargo:rustc-link-arg` now")), /// Allows using `#[main]` to replace the entrypoint `#[lang = "start"]` calls. (removed, main, "1.53.0", Some(29634), None, None), + (removed, pub_macro_rules, "1.53.0", Some(78855), None, + Some("removed due to being incomplete, in particular it does not work across crates")), // ------------------------------------------------------------------------- // feature-group-end: removed features |