about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-18 22:44:46 +0000
committerbors <bors@rust-lang.org>2020-01-18 22:44:46 +0000
commit0a7003ecf0e80b3237068df0210767120aca4d25 (patch)
treee59c96d9a4fbd326068136943dea8554c2f9e748
parent0964b8d19274953d29929b6962f75c168aee15e2 (diff)
parentb2c4f09d7718d2aaa7b4d80b8e2095a870e2b848 (diff)
downloadrust-0a7003ecf0e80b3237068df0210767120aca4d25.tar.gz
rust-0a7003ecf0e80b3237068df0210767120aca4d25.zip
Auto merge of #5065 - matthiaskrgr:rustup_28, r=matthiaskrgr
rustup https://github.com/rust-lang/rust/pull/67712

slice_patterns have been stabilized.

changelog: none
-rw-r--r--clippy_lints/src/lib.rs1
-rw-r--r--tests/ui/patterns.fixed1
-rw-r--r--tests/ui/patterns.rs1
-rw-r--r--tests/ui/patterns.stderr2
4 files changed, 1 insertions, 4 deletions
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index b37e0945d77..5fe0d937f2f 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -3,7 +3,6 @@
 #![feature(box_syntax)]
 #![feature(box_patterns)]
 #![feature(rustc_private)]
-#![feature(slice_patterns)]
 #![feature(stmt_expr_attributes)]
 #![allow(clippy::missing_docs_in_private_items, clippy::must_use_candidate)]
 #![recursion_limit = "512"]
diff --git a/tests/ui/patterns.fixed b/tests/ui/patterns.fixed
index a443db7495d..dfe27e193b9 100644
--- a/tests/ui/patterns.fixed
+++ b/tests/ui/patterns.fixed
@@ -1,7 +1,6 @@
 // run-rustfix
 #![allow(unused)]
 #![warn(clippy::all)]
-#![feature(slice_patterns)]
 
 fn main() {
     let v = Some(true);
diff --git a/tests/ui/patterns.rs b/tests/ui/patterns.rs
index 2c9f839ecf6..bd202fc0420 100644
--- a/tests/ui/patterns.rs
+++ b/tests/ui/patterns.rs
@@ -1,7 +1,6 @@
 // run-rustfix
 #![allow(unused)]
 #![warn(clippy::all)]
-#![feature(slice_patterns)]
 
 fn main() {
     let v = Some(true);
diff --git a/tests/ui/patterns.stderr b/tests/ui/patterns.stderr
index 784a3feaace..f25e71e872b 100644
--- a/tests/ui/patterns.stderr
+++ b/tests/ui/patterns.stderr
@@ -1,5 +1,5 @@
 error: the `y @ _` pattern can be written as just `y`
-  --> $DIR/patterns.rs:11:9
+  --> $DIR/patterns.rs:10:9
    |
 LL |         y @ _ => (),
    |         ^^^^^ help: try: `y`