Skip to content

Commit 7c90189

Browse files
petrochenkovpetrochenkov
committed
Stabilize slice patterns without ..
Merge `feature(advanced_slice_patterns)` into `feature(slice_patterns)`
1 parent a04b88d commit 7c90189

File tree

75 files changed

+124
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+124
-226
lines changed

‎src/doc/unstable-book/src/language-features/advanced-slice-patterns.md

-35
This file was deleted.

‎src/doc/unstable-book/src/language-features/slice-patterns.md

+16-12
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,29 @@ The tracking issue for this feature is: [#23121]
44

55
[#23121]: https://github.com/rust-lang/rust/issues/23121
66

7-
See also
8-
[`advanced_slice_patterns`](language-features/advanced-slice-patterns.html).
9-
107
------------------------
118

12-
13-
If you want to match against a slice or array, you can use `&` with the
14-
`slice_patterns` feature:
9+
The `slice_patterns` feature gate lets you use `..` to indicate any number of
10+
elements inside a pattern matching a slice. This wildcard can only be used once
11+
for a given array. If there's an pattern before the `..`, the subslice will be
12+
matched against that pattern. For example:
1513

1614
```rust
1715
#![feature(slice_patterns)]
1816

17+
fn is_symmetric(list: &[u32]) -> bool {
18+
match list {
19+
&[] | &[_] => true,
20+
&[x, ref inside.., y] if x == y => is_symmetric(inside),
21+
&[..] => false,
22+
}
23+
}
24+
1925
fn main() {
20-
let v = vec!["match_this", "1"];
26+
let sym = &[0, 1, 4, 2, 4, 1, 0];
27+
assert!(is_symmetric(sym));
2128

22-
match &v[..] {
23-
&["match_this", second] => println!("The second element is {}", second),
24-
_ => {},
25-
}
29+
let not_sym = &[0, 1, 7, 2, 4, 1, 0];
30+
assert!(!is_symmetric(not_sym));
2631
}
2732
```
28-

‎src/liballoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
#![feature(ptr_internals)]
111111
#![feature(rustc_attrs)]
112112
#![feature(slice_get_slice)]
113-
#![feature(slice_patterns)]
114113
#![feature(slice_rsplit)]
115114
#![feature(specialization)]
116115
#![feature(staged_api)]

‎src/libcore/benches/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![deny(warnings)]
1212

1313
#![feature(flt2dec)]
14-
#![feature(slice_patterns)]
1514
#![feature(test)]
1615

1716
extern crate core;

‎src/libcore/tests/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#![feature(raw)]
3838
#![feature(refcell_replace_swap)]
3939
#![feature(slice_patterns)]
40+
#![feature(slice_rotate)]
4041
#![feature(sort_internals)]
4142
#![feature(specialization)]
4243
#![feature(step_trait)]

‎src/librustc/benches/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![deny(warnings)]
1212

13-
#![feature(slice_patterns)]
1413
#![feature(test)]
1514

1615
extern crate test;

‎src/librustc_apfloat/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#![forbid(unsafe_code)]
4848

4949
#![feature(i128_type)]
50-
#![feature(slice_patterns)]
50+
#![cfg_attr(stage0, feature(slice_patterns))]
5151
#![feature(try_from)]
5252

5353
// See librustc_cratesio_shim/Cargo.toml for a comment explaining this.

‎src/librustc_const_eval/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#![deny(warnings)]
2121

2222
#![feature(rustc_diagnostic_macros)]
23-
#![feature(slice_patterns)]
2423
#![feature(box_patterns)]
2524
#![feature(box_syntax)]
2625
#![feature(macro_lifetime_matcher)]

‎src/librustc_lint/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#![feature(macro_vis_matcher)]
3232
#![feature(quote)]
3333
#![feature(rustc_diagnostic_macros)]
34-
#![feature(slice_patterns)]
3534
#![cfg_attr(stage0, feature(never_type))]
3635

3736
#[macro_use]

‎src/librustc_trans/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#![feature(libc)]
3131
#![feature(quote)]
3232
#![feature(rustc_diagnostic_macros)]
33-
#![feature(slice_patterns)]
33+
#![cfg_attr(stage0, feature(slice_patterns))]
3434
#![feature(conservative_impl_trait)]
3535
#![feature(optin_builtin_traits)]
3636
#![feature(inclusive_range_fields)]

‎src/librustc_trans_utils/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#![feature(i128_type)]
2525
#![feature(quote)]
2626
#![feature(rustc_diagnostic_macros)]
27-
#![feature(slice_patterns)]
2827
#![feature(conservative_impl_trait)]
2928

3029
extern crate ar;

‎src/librustc_typeck/diagnostics.rs

-6
Original file line numberDiff line numberDiff line change
@@ -3559,8 +3559,6 @@ elements in the array being matched.
35593559
Example of erroneous code:
35603560
35613561
```compile_fail,E0527
3562-
#![feature(slice_patterns)]
3563-
35643562
let r = &[1, 2, 3, 4];
35653563
match r {
35663564
&[a, b] => { // error: pattern requires 2 elements but array
@@ -3625,8 +3623,6 @@ An array or slice pattern was matched against some other type.
36253623
Example of erroneous code:
36263624
36273625
```compile_fail,E0529
3628-
#![feature(slice_patterns)]
3629-
36303626
let r: f32 = 1.0;
36313627
match r {
36323628
[a, b] => { // error: expected an array or slice, found `f32`
@@ -3639,8 +3635,6 @@ Ensure that the pattern and the expression being matched on are of consistent
36393635
types:
36403636
36413637
```
3642-
#![feature(slice_patterns)]
3643-
36443638
let r = [1.0, 2.0];
36453639
match r {
36463640
[a, b] => { // ok!

‎src/librustc_typeck/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ This API is completely unstable and subject to change.
7272

7373
#![allow(non_camel_case_types)]
7474

75-
#![feature(advanced_slice_patterns)]
75+
#![cfg_attr(stage0, feature(advanced_slice_patterns))]
7676
#![feature(box_patterns)]
7777
#![feature(box_syntax)]
7878
#![feature(conservative_impl_trait)]

‎src/librustdoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#![feature(box_syntax)]
2121
#![feature(fs_read_write)]
2222
#![feature(set_stdio)]
23-
#![feature(slice_patterns)]
23+
#![cfg_attr(stage0, feature(slice_patterns))]
2424
#![feature(test)]
2525
#![feature(unicode)]
2626
#![feature(vec_remove_item)]

‎src/libsyntax/feature_gate.rs

+5-11
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ declare_features! (
145145
// rustc internal
146146
(active, rustc_diagnostic_macros, "1.0.0", None, None),
147147
(active, rustc_const_unstable, "1.0.0", None, None),
148-
(active, advanced_slice_patterns, "1.0.0", Some(23121), None),
149148
(active, box_syntax, "1.0.0", Some(27779), None),
150149
(active, placement_in_syntax, "1.0.0", Some(27779), None),
151150
(active, unboxed_closures, "1.0.0", Some(29625), None),
@@ -474,6 +473,8 @@ declare_features! (
474473
(removed, allocator, "1.0.0", None, None),
475474
// Allows the `#[simd]` attribute -- removed in favor of `#[repr(simd)]`
476475
(removed, simd, "1.0.0", Some(27731), None),
476+
// Merged into `slice_patterns`
477+
(removed, advanced_slice_patterns, "1.0.0", Some(23121), None),
477478
);
478479

479480
declare_features! (
@@ -1655,17 +1656,10 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
16551656

16561657
fn visit_pat(&mut self, pattern: &'a ast::Pat) {
16571658
match pattern.node {
1658-
PatKind::Slice(_, Some(_), ref last) if !last.is_empty() => {
1659-
gate_feature_post!(&self, advanced_slice_patterns,
1660-
pattern.span,
1661-
"multiple-element slice matches anywhere \
1662-
but at the end of a slice (e.g. \
1663-
`[0, ..xs, 0]`) are experimental")
1664-
}
1665-
PatKind::Slice(..) => {
1659+
PatKind::Slice(_, Some(ref subslice), _) => {
16661660
gate_feature_post!(&self, slice_patterns,
1667-
pattern.span,
1668-
"slice pattern syntax is experimental");
1661+
subslice.span,
1662+
"syntax for subslices in slice patterns is not yet stabilized");
16691663
}
16701664
PatKind::Box(..) => {
16711665
gate_feature_post!(&self, box_patterns,

‎src/libsyntax/parse/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3618,7 +3618,7 @@ impl<'a> Parser<'a> {
36183618
slice = Some(P(Pat {
36193619
id: ast::DUMMY_NODE_ID,
36203620
node: PatKind::Wild,
3621-
span: self.span,
3621+
span: self.prev_span,
36223622
}));
36233623
before_slice = false;
36243624
}

‎src/test/compile-fail/borrowck/borrowck-describe-lvalue.rs

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
//[mir]compile-flags: -Z borrowck=mir
1414

1515
#![feature(slice_patterns)]
16-
#![feature(advanced_slice_patterns)]
1716

1817
pub struct Foo {
1918
x: u32

‎src/test/compile-fail/borrowck/borrowck-match-binding-is-assignment.rs

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
// Test that immutable pattern bindings cannot be reassigned.
1515

16-
#![feature(slice_patterns)]
17-
1816
enum E {
1917
Foo(isize)
2018
}

‎src/test/compile-fail/borrowck/borrowck-move-out-from-array.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
// revisions: ast mir
1212
//[mir]compile-flags: -Z borrowck=mir
1313

14-
#![feature(box_syntax, slice_patterns, advanced_slice_patterns)]
14+
#![feature(box_syntax)]
15+
#![feature(slice_patterns)]
1516

1617
fn move_out_from_begin_and_end() {
1718
let a = [box 1, box 2];

‎src/test/compile-fail/borrowck/borrowck-vec-pattern-element-loan.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(advanced_slice_patterns)]
1211
#![feature(slice_patterns)]
1312

1413
fn a<'a>() -> &'a [isize] {

‎src/test/compile-fail/issue-12369.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
#![feature(slice_patterns)]
12-
#![allow(unused_variables)]
1312
#![deny(unreachable_patterns)]
1413

1514
fn main() {

‎src/test/compile-fail/issue-13482-2.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
// compile-flags:-Z verbose
1212

13-
#![feature(slice_patterns)]
14-
1513
fn main() {
1614
let x = [1,2];
1715
let y = match x {

‎src/test/compile-fail/issue-13482.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(slice_patterns)]
12-
1311
fn main() {
1412
let x = [1,2];
1513
let y = match x {

‎src/test/compile-fail/issue-15381.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(slice_patterns)]
12-
1311
fn main() {
1412
let values: Vec<u8> = vec![1,2,3,4,5,6,7,8];
1513

‎src/test/compile-fail/issue-41255.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// Matching against float literals should result in a linter error
1212

13-
#![feature(slice_patterns)]
1413
#![feature(exclusive_range_pattern)]
1514
#![allow(unused)]
1615
#![forbid(illegal_floating_point_literal_pattern)]

‎src/test/compile-fail/issue-6804.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// Matching against NaN should result in a warning
1212

13-
#![feature(slice_patterns)]
1413
#![allow(unused)]
1514
#![deny(illegal_floating_point_literal_pattern)]
1615

‎src/test/compile-fail/match-byte-array-patterns-2.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(advanced_slice_patterns, slice_patterns)]
12-
1311
fn main() {
1412
let buf = &[0, 1, 2, 3];
1513

‎src/test/compile-fail/match-byte-array-patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(advanced_slice_patterns, slice_patterns)]
11+
#![feature(slice_patterns)]
1212
#![deny(unreachable_patterns)]
1313

1414
fn main() {

‎src/test/compile-fail/match-ref-ice.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(slice_patterns)]
1211
#![deny(unreachable_patterns)]
1312

1413
// The arity of `ref x` is always 1. If the pattern is compared to some non-structural type whose

‎src/test/compile-fail/match-slice-patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(advanced_slice_patterns, slice_patterns)]
11+
#![feature(slice_patterns)]
1212

1313
fn check(list: &[Option<()>]) {
1414
match list {

‎src/test/compile-fail/match-vec-fixed.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(slice_patterns)]
1211
#![deny(unreachable_patterns)]
1312

1413
fn a() {

‎src/test/compile-fail/match-vec-mismatch-2.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(slice_patterns)]
12-
1311
fn main() {
1412
match () {
1513
[()] => { }

‎src/test/compile-fail/match-vec-unreachable.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#![feature(slice_patterns)]
1212
#![deny(unreachable_patterns)]
13-
#![allow(unused_variables)]
1413

1514
fn main() {
1615
let x: Vec<(isize, isize)> = Vec::new();

‎src/test/compile-fail/move-out-of-slice-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(slice_patterns, box_patterns)]
11+
#![feature(box_patterns)]
1212

1313
struct A;
1414

0 commit comments

Comments
 (0)