about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSmitty <me@smitop.com>2021-06-28 14:39:20 -0400
committerSmitty <me@smitop.com>2021-06-28 14:39:20 -0400
commit11ebd80fe75ec02dbdd8058b8952d25eccb0c3dc (patch)
tree90c1545aedcc496d58758a57c49076d78f775414 /src
parent1abb5bc992f0ab95ec507aa4b4feed12ec5a4450 (diff)
downloadrust-11ebd80fe75ec02dbdd8058b8952d25eccb0c3dc.tar.gz
rust-11ebd80fe75ec02dbdd8058b8952d25eccb0c3dc.zip
Make incomplete features part of delcaration
This prevents mistakes where the feature is in the list of incomplete
features but not actually a feature by making the incompleteness a part
of the declaration.
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/feature-gates/rustc_insignificant_dtor.rs2
-rw-r--r--src/test/ui/feature-gates/rustc_insignificant_dtor.stderr9
-rw-r--r--src/tools/tidy/src/features.rs1
3 files changed, 1 insertions, 11 deletions
diff --git a/src/test/ui/feature-gates/rustc_insignificant_dtor.rs b/src/test/ui/feature-gates/rustc_insignificant_dtor.rs
deleted file mode 100644
index b3b214a7ce2..00000000000
--- a/src/test/ui/feature-gates/rustc_insignificant_dtor.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-#![feature(rustc_insignificant_dtor)] //~ ERROR unknown feature `rustc_insignificant_dtor`
-fn main() {}
diff --git a/src/test/ui/feature-gates/rustc_insignificant_dtor.stderr b/src/test/ui/feature-gates/rustc_insignificant_dtor.stderr
deleted file mode 100644
index 560e27e34bc..00000000000
--- a/src/test/ui/feature-gates/rustc_insignificant_dtor.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0635]: unknown feature `rustc_insignificant_dtor`
-  --> $DIR/rustc_insignificant_dtor.rs:1:12
-   |
-LL | #![feature(rustc_insignificant_dtor)]
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0635`.
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index a7e700b935e..338dfd11310 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -301,6 +301,7 @@ fn collect_lang_features_in(base: &Path, file: &str, bad: &mut bool) -> Features
             let mut parts = line.split(',');
             let level = match parts.next().map(|l| l.trim().trim_start_matches('(')) {
                 Some("active") => Status::Unstable,
+                Some("incomplete") => Status::Unstable,
                 Some("removed") => Status::Removed,
                 Some("accepted") => Status::Stable,
                 _ => return None,