Rollup merge of #24033 - petrochenkov:pattest, r=alexcrichton
This was supposed to be a part of #23930
This commit is contained in:
commit
90b9b0df07
21
src/test/parse-fail/pat-lt-bracket-4.rs
Normal file
21
src/test/parse-fail/pat-lt-bracket-4.rs
Normal file
@ -0,0 +1,21 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
enum BtNode {
|
||||
Node(u32,Box<BtNode>,Box<BtNode>),
|
||||
Leaf(u32),
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let y = match x {
|
||||
Foo<T>::A(value) => value, //~ error: expected one of `=>`, `@`, `if`, or `|`, found `<`
|
||||
Foo<T>::B => 7,
|
||||
};
|
||||
}
|
13
src/test/parse-fail/pat-lt-bracket-5.rs
Normal file
13
src/test/parse-fail/pat-lt-bracket-5.rs
Normal file
@ -0,0 +1,13 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
fn main() {
|
||||
let v[0] = v[1]; //~ error: expected one of `:`, `;`, `=`, or `@`, found `[`
|
||||
}
|
13
src/test/parse-fail/pat-lt-bracket-6.rs
Normal file
13
src/test/parse-fail/pat-lt-bracket-6.rs
Normal file
@ -0,0 +1,13 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
fn main() {
|
||||
let Test(&desc[..]) = x; //~ error: expected one of `,` or `@`, found `[`
|
||||
}
|
13
src/test/parse-fail/pat-lt-bracket-7.rs
Normal file
13
src/test/parse-fail/pat-lt-bracket-7.rs
Normal file
@ -0,0 +1,13 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
fn main() {
|
||||
for thing(x[]) {} //~ error: expected one of `,` or `@`, found `[`
|
||||
}
|
15
src/test/parse-fail/pat-ranges-1.rs
Normal file
15
src/test/parse-fail/pat-ranges-1.rs
Normal file
@ -0,0 +1,15 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Parsing of range patterns
|
||||
|
||||
fn main() {
|
||||
let macropus!() ... 11 = 12; //~ error: expected one of `:`, `;`, or `=`, found `...`
|
||||
}
|
15
src/test/parse-fail/pat-ranges-2.rs
Normal file
15
src/test/parse-fail/pat-ranges-2.rs
Normal file
@ -0,0 +1,15 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Parsing of range patterns
|
||||
|
||||
fn main() {
|
||||
let 10 ... makropulos!() = 12; //~ error: expected one of `::`, `:`, `;`, or `=`, found `!`
|
||||
}
|
15
src/test/parse-fail/pat-ranges-3.rs
Normal file
15
src/test/parse-fail/pat-ranges-3.rs
Normal file
@ -0,0 +1,15 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Parsing of range patterns
|
||||
|
||||
fn main() {
|
||||
let 10 ... 10 + 3 = 12; //~ expected one of `:`, `;`, or `=`, found `+`
|
||||
}
|
15
src/test/parse-fail/pat-ranges-4.rs
Normal file
15
src/test/parse-fail/pat-ranges-4.rs
Normal file
@ -0,0 +1,15 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Parsing of range patterns
|
||||
|
||||
fn main() {
|
||||
let 10 - 3 ... 10 = 8; //~ error: expected one of `...`, `:`, `;`, or `=`, found `-`
|
||||
}
|
54
src/test/run-pass/issue-22546.rs
Normal file
54
src/test/run-pass/issue-22546.rs
Normal file
@ -0,0 +1,54 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Parsing patterns with paths with type parameters (issue #22544)
|
||||
|
||||
use std::default::Default;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Foo<T>(T, T);
|
||||
|
||||
impl<T: ::std::fmt::Display> Foo<T> {
|
||||
fn foo(&self) {
|
||||
match *self {
|
||||
Foo::<T>(ref x, ref y) => println!("Goodbye, World! {} {}", x, y)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
trait Tr {
|
||||
type U;
|
||||
}
|
||||
|
||||
impl<T> Tr for Foo<T> {
|
||||
type U = T;
|
||||
}
|
||||
|
||||
struct Wrapper<T> {
|
||||
value: T
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let Foo::<i32>(a, b) = Default::default();
|
||||
|
||||
let f = Foo(2,3);
|
||||
f.foo();
|
||||
|
||||
let w = Wrapper { value: Foo(10u8, 11u8) };
|
||||
match w {
|
||||
Wrapper::<Foo<u8>> { value: Foo(10, 11) } => {},
|
||||
::Wrapper::<<Foo<_> as Tr>::U> { value: Foo::<u8>(11, 16) } => { panic!() },
|
||||
_ => { panic!() }
|
||||
}
|
||||
|
||||
if let None::<u8> = Some(8) {
|
||||
panic!();
|
||||
}
|
||||
}
|
23
src/test/run-pass/pat-ranges.rs
Normal file
23
src/test/run-pass/pat-ranges.rs
Normal file
@ -0,0 +1,23 @@
|
||||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// Parsing of range patterns
|
||||
|
||||
const NUM1: i32 = 10;
|
||||
|
||||
mod m {
|
||||
pub const NUM2: i32 = 16;
|
||||
}
|
||||
|
||||
fn main() {
|
||||
if let NUM1 ... m::NUM2 = 10 {} else { panic!() }
|
||||
if let ::NUM1 ... ::m::NUM2 = 11 {} else { panic!() }
|
||||
if let -13 ... -10 = 12 { panic!() } else {}
|
||||
}
|
Loading…
Reference in New Issue
Block a user