about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2018-09-06 10:47:41 -0600
committerMatthias Krüger <matthias.krueger@famsik.de>2018-09-09 02:28:13 +0200
commit5af06768a9b80afd9c1b8bbed695152d4ac5d9db (patch)
tree6810e8092b7777448dc4e89394c6d5374015a5b4
parent4d1ec818118c6c5dac5af19b291b9601ef98c17e (diff)
downloadrust-5af06768a9b80afd9c1b8bbed695152d4ac5d9db.tar.gz
rust-5af06768a9b80afd9c1b8bbed695152d4ac5d9db.zip
Remove crate_visibility_modifier from 2018 edition
-rw-r--r--src/libsyntax/feature_gate.rs2
-rw-r--r--src/test/ui-fulldeps/unnecessary-extern-crate.rs2
-rw-r--r--src/test/ui/crate-in-paths.rs2
-rw-r--r--src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed2
-rw-r--r--src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs2
-rw-r--r--src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed2
-rw-r--r--src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs2
-rw-r--r--src/test/ui/rust-2018/edition-lint-nested-paths.fixed2
-rw-r--r--src/test/ui/rust-2018/edition-lint-nested-paths.rs2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 0270e36db11..9a9fb055292 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -389,7 +389,7 @@ declare_features! (
     (active, non_exhaustive, "1.22.0", Some(44109), None),
 
     // `crate` as visibility modifier, synonymous to `pub(crate)`
-    (active, crate_visibility_modifier, "1.23.0", Some(45388), Some(Edition::Edition2018)),
+    (active, crate_visibility_modifier, "1.23.0", Some(45388), None),
 
     // extern types
     (active, extern_types, "1.23.0", Some(43467), None),
diff --git a/src/test/ui-fulldeps/unnecessary-extern-crate.rs b/src/test/ui-fulldeps/unnecessary-extern-crate.rs
index ea3e0587958..df723ddf590 100644
--- a/src/test/ui-fulldeps/unnecessary-extern-crate.rs
+++ b/src/test/ui-fulldeps/unnecessary-extern-crate.rs
@@ -11,7 +11,7 @@
 // edition:2018
 
 #![deny(unused_extern_crates)]
-#![feature(alloc, test, libc)]
+#![feature(alloc, test, libc, crate_visibility_modifier)]
 
 extern crate alloc;
 //~^ ERROR unused extern crate
diff --git a/src/test/ui/crate-in-paths.rs b/src/test/ui/crate-in-paths.rs
index ef01294f941..cbf60b6b6a6 100644
--- a/src/test/ui/crate-in-paths.rs
+++ b/src/test/ui/crate-in-paths.rs
@@ -10,7 +10,7 @@
 
 // edition:2018
 
-#![feature(edition_2018_preview)]
+#![feature(crate_visibility_modifier)]
 
 mod bar {
     crate struct Foo;
diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed
index 279d4e9a806..211d2b726de 100644
--- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed
+++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed
@@ -10,7 +10,7 @@
 
 // run-rustfix
 
-#![feature(rust_2018_preview)]
+#![feature(rust_2018_preview, crate_visibility_modifier)]
 #![deny(absolute_paths_not_starting_with_crate)]
 
 mod foo {
diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs
index ff290555a69..90b5a7f8162 100644
--- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs
+++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs
@@ -10,7 +10,7 @@
 
 // run-rustfix
 
-#![feature(rust_2018_preview)]
+#![feature(rust_2018_preview, crate_visibility_modifier)]
 #![deny(absolute_paths_not_starting_with_crate)]
 
 mod foo {
diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed
index 929b7cd061b..94803a117dc 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed
+++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed
@@ -10,7 +10,7 @@
 
 // run-rustfix
 
-#![feature(rust_2018_preview)]
+#![feature(rust_2018_preview, crate_visibility_modifier)]
 #![deny(absolute_paths_not_starting_with_crate)]
 #![allow(unused_imports)]
 #![allow(dead_code)]
diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs
index b5693c4bb93..7f68eeff438 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs
+++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs
@@ -10,7 +10,7 @@
 
 // run-rustfix
 
-#![feature(rust_2018_preview)]
+#![feature(rust_2018_preview, crate_visibility_modifier)]
 #![deny(absolute_paths_not_starting_with_crate)]
 #![allow(unused_imports)]
 #![allow(dead_code)]
diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.fixed b/src/test/ui/rust-2018/edition-lint-nested-paths.fixed
index 06f6b6d75a7..ee54229bfb2 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-paths.fixed
+++ b/src/test/ui/rust-2018/edition-lint-nested-paths.fixed
@@ -10,7 +10,7 @@
 
 // run-rustfix
 
-#![feature(rust_2018_preview)]
+#![feature(rust_2018_preview, crate_visibility_modifier)]
 #![deny(absolute_paths_not_starting_with_crate)]
 
 use crate::foo::{a, b};
diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.rs b/src/test/ui/rust-2018/edition-lint-nested-paths.rs
index c2831ec04b7..9a42f5f28c8 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-paths.rs
+++ b/src/test/ui/rust-2018/edition-lint-nested-paths.rs
@@ -10,7 +10,7 @@
 
 // run-rustfix
 
-#![feature(rust_2018_preview)]
+#![feature(rust_2018_preview, crate_visibility_modifier)]
 #![deny(absolute_paths_not_starting_with_crate)]
 
 use foo::{a, b};