diff options
| author | bors <bors@rust-lang.org> | 2019-01-26 18:14:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-26 18:14:46 +0000 |
| commit | 20c2cba61dc83e612d25ed496025171caa3db30f (patch) | |
| tree | f6294c9e220acd5733dfe7b39541f4e2640c7187 /src/libsyntax | |
| parent | 46a43dc1e987156c4c03a8c92c8ba7b21363982b (diff) | |
| parent | 97833ee506d2b69c46bad4aad07aab89c7f03516 (diff) | |
| download | rust-20c2cba61dc83e612d25ed496025171caa3db30f.tar.gz rust-20c2cba61dc83e612d25ed496025171caa3db30f.zip | |
Auto merge of #57918 - Centril:rollup, r=Centril
Rollup of 7 pull requests Successful merges: - #57407 (Stabilize extern_crate_self) - #57703 (Make MutexGuard's Debug implementation more useful.) - #57764 (Fix some minor warnings) - #57825 (un-deprecate mem::zeroed) - #57827 (Ignore aarch64 in simd-intrinsic-generic-reduction) - #57908 (resolve: Fix span arithmetics in the import conflict error) - #57913 (Change crate-visibility-modifier issue number in The Unstable Book) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index d74a0d5623a..28209248246 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -453,9 +453,6 @@ declare_features! ( // Adds `reason` and `expect` lint attributes. (active, lint_reasons, "1.31.0", Some(54503), None), - // `extern crate self as foo;` puts local crate root into extern prelude under name `foo`. - (active, extern_crate_self, "1.31.0", Some(56409), None), - // Allows paths to enum variants on type aliases. (active, type_alias_enum_variants, "1.31.0", Some(49683), None), @@ -689,6 +686,8 @@ declare_features! ( (accepted, uniform_paths, "1.32.0", Some(53130), None), // Allows `cfg(target_vendor = "...")`. (accepted, cfg_target_vendor, "1.33.0", Some(29718), None), + // `extern crate self as foo;` puts local crate root into extern prelude under name `foo`. + (accepted, extern_crate_self, "1.34.0", Some(56409), None), ); // If you change this, please modify `src/doc/unstable-book` as well. You must |