diff options
| author | Scott McMurray <scottmcm@users.noreply.github.com> | 2018-10-08 23:31:50 -0700 |
|---|---|---|
| committer | Scott McMurray <scottmcm@users.noreply.github.com> | 2018-10-19 22:26:02 -0700 |
| commit | 74df5ec387e40097853df9fb25318a5f501e5d99 (patch) | |
| tree | 0e7e93e0cdb6f95507b87f76dfde0353f8a53c8d /src/libsyntax | |
| parent | 4ab691ac2c3dbfc28ecaeb292f76c933adb0a5e7 (diff) | |
| download | rust-74df5ec387e40097853df9fb25318a5f501e5d99.tar.gz rust-74df5ec387e40097853df9fb25318a5f501e5d99.zip | |
Add a stub feature so we can still test E0705
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/diagnostic_list.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/libsyntax/diagnostic_list.rs b/src/libsyntax/diagnostic_list.rs index 5155ebbe19d..cd421de5f1d 100644 --- a/src/libsyntax/diagnostic_list.rs +++ b/src/libsyntax/diagnostic_list.rs @@ -375,15 +375,15 @@ and likely to change in the future. E0705: r##" A `#![feature]` attribute was declared for a feature that is stable in -the current edition. +the current edition, but not in all editions. Erroneous code example: ```ignore (limited to a warning during 2018 edition development) #![feature(rust_2018_preview)] -#![feature(impl_header_lifetime_elision)] // error: the feature - // `impl_header_lifetime_elision` is - // included in the Rust 2018 edition +#![feature(test_2018_feature)] // error: the feature + // `test_2018_feature` is + // included in the Rust 2018 edition ``` "##, diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 90a5a4cef21..1025943decc 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -462,6 +462,9 @@ declare_features! ( (active, abi_amdgpu_kernel, "1.29.0", Some(51575), None), + // Perma-unstable; added for testing E0705 + (active, test_2018_feature, "1.31.0", Some(0), Some(Edition::Edition2018)), + // Support for arbitrary delimited token streams in non-macro attributes (active, unrestricted_attribute_tokens, "1.30.0", Some(44690), None), |