about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-09-09 16:09:39 +0000
committerbors <bors@rust-lang.org>2018-09-09 16:09:39 +0000
commitf50b7758f4dc85dc1c5e38258adaa94213ac6ed1 (patch)
tree65ad26613543c84cf9d84d894f249cb381e33700 /src/libsyntax
parent40fc8ba5f95125f307ef17f11ec02b3f5fdad562 (diff)
parent60be0686e0c7135bf67d1df767cd2f792f2e94f4 (diff)
downloadrust-f50b7758f4dc85dc1c5e38258adaa94213ac6ed1.tar.gz
rust-f50b7758f4dc85dc1c5e38258adaa94213ac6ed1.zip
Auto merge of #54057 - matthiaskrgr:stabilize-edition-plus-clippy, r=Mark-Simulacrum
Stabilize edition 2018; also updates Clippy, RLS and Cargo

Supersedes https://github.com/rust-lang/rust/pull/53999 , https://github.com/rust-lang/rust/pull/53935
Clippy build was failing there because crate_visibility_modifier feature was taken out of edition 2018 and clippy used it.
The clippy update enables the corresponding feature explicitly.

r? @Mark-Simulacrum
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs2
1 files changed, 1 insertions, 1 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),