Skip to content

Commit e9da46c

Browse files
committed
---
yaml --- r: 275855 b: refs/heads/auto c: 4bd44be h: refs/heads/master i: 275853: ef5402d 275851: 82ae634 275847: 77e24d4 275839: 3dd4acb
1 parent b403c87 commit e9da46c

37 files changed

+179
-76
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 9108fb7bae11f18715d971eeae1e5ca84662e1ee
11+
refs/heads/auto: 4bd44be369c883f1fb2b0645f4de4827066cec57
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/etc/generate-keyword-tests.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,17 @@
3434
// option. This file may not be copied, modified, or distributed
3535
// except according to those terms.
3636
37+
// compile-flags: -Z parse-only
38+
3739
// This file was auto-generated using 'src/etc/generate-keyword-tests.py %s'
3840
3941
fn main() {
40-
let %s = "foo"; //~ error: ident
42+
let %s = "foo"; //~ error: expected pattern, found keyword `%s`
4143
}
4244
"""
4345

4446
test_dir = os.path.abspath(
45-
os.path.join(os.path.dirname(__file__), '../test/compile-fail')
47+
os.path.join(os.path.dirname(__file__), '../test/parse-fail')
4648
)
4749

4850
for kw in sys.argv[1:]:
@@ -53,7 +55,7 @@
5355
os.chmod(test_file, stat.S_IWUSR)
5456

5557
with open(test_file, 'wt') as f:
56-
f.write(template % (datetime.datetime.now().year, kw, kw))
58+
f.write(template % (datetime.datetime.now().year, kw, kw, kw))
5759

5860
# mark file read-only
5961
os.chmod(test_file, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,10 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test -- FIXME #33010
12-
13-
// This file was auto-generated using 'src/etc/generate-keyword-tests.py false'
14-
1511
fn main() {
16-
let false = "foo"; //~ error: ident
12+
let false = "foo"; //~ error: mismatched types
1713
}
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,10 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-test -- FIXME #33010
12-
13-
// This file was auto-generated using 'src/etc/generate-keyword-tests.py true'
14-
1511
fn main() {
16-
let true = "foo"; //~ error: ident
12+
let true = "foo"; //~ error: mismatched types
1713
}

branches/auto/src/test/parse-fail/keyword-as-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py as'
1414

1515
fn main() {
16-
let as = "foo"; //~ error: ident
16+
let as = "foo"; //~ error: expected pattern, found keyword `as`
1717
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: -Z parse-only
12+
13+
fn main() {
14+
let box = "foo"; //~ error: expected pattern, found `=`
15+
}

branches/auto/src/test/parse-fail/keyword-break-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py break'
1414

1515
fn main() {
16-
let break = "foo"; //~ error: ident
16+
let break = "foo"; //~ error: expected pattern, found keyword `break`
1717
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: -Z parse-only
12+
13+
// This file was auto-generated using 'src/etc/generate-keyword-tests.py const'
14+
15+
fn main() {
16+
let const = "foo"; //~ error: expected pattern, found keyword `const`
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: -Z parse-only
12+
13+
// This file was auto-generated using 'src/etc/generate-keyword-tests.py continue'
14+
15+
fn main() {
16+
let continue = "foo"; //~ error: expected pattern, found keyword `continue`
17+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: -Z parse-only
12+
13+
// This file was auto-generated using 'src/etc/generate-keyword-tests.py crate'
14+
15+
fn main() {
16+
let crate = "foo"; //~ error: expected pattern, found keyword `crate`
17+
}

branches/auto/src/test/parse-fail/keyword-else-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py else'
1414

1515
fn main() {
16-
let else = "foo"; //~ error: ident
16+
let else = "foo"; //~ error: expected pattern, found keyword `else`
1717
}

branches/auto/src/test/parse-fail/keyword-enum-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py enum'
1414

1515
fn main() {
16-
let enum = "foo"; //~ error: ident
16+
let enum = "foo"; //~ error: expected pattern, found keyword `enum`
1717
}

branches/auto/src/test/parse-fail/keyword-extern-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py extern'
1414

1515
fn main() {
16-
let extern = "foo"; //~ error: ident
16+
let extern = "foo"; //~ error: expected pattern, found keyword `extern`
1717
}

branches/auto/src/test/parse-fail/keyword-fn-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py fn'
1414

1515
fn main() {
16-
let fn = "foo"; //~ error: ident
16+
let fn = "foo"; //~ error: expected pattern, found keyword `fn`
1717
}

branches/auto/src/test/parse-fail/keyword-for-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py for'
1414

1515
fn main() {
16-
let for = "foo"; //~ error: ident
16+
let for = "foo"; //~ error: expected pattern, found keyword `for`
1717
}

branches/auto/src/test/parse-fail/keyword-if-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py if'
1414

1515
fn main() {
16-
let if = "foo"; //~ error: ident
16+
let if = "foo"; //~ error: expected pattern, found keyword `if`
1717
}

branches/auto/src/test/parse-fail/keyword-impl-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py impl'
1414

1515
fn main() {
16-
let impl = "foo"; //~ error: ident
16+
let impl = "foo"; //~ error: expected pattern, found keyword `impl`
1717
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: -Z parse-only
12+
13+
// This file was auto-generated using 'src/etc/generate-keyword-tests.py in'
14+
15+
fn main() {
16+
let in = "foo"; //~ error: expected pattern, found keyword `in`
17+
}

branches/auto/src/test/parse-fail/keyword-let-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py let'
1414

1515
fn main() {
16-
let let = "foo"; //~ error: ident
16+
let let = "foo"; //~ error: expected pattern, found keyword `let`
1717
}

branches/auto/src/test/parse-fail/keyword-loop-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py loop'
1414

1515
fn main() {
16-
let loop = "foo"; //~ error: ident
16+
let loop = "foo"; //~ error: expected pattern, found keyword `loop`
1717
}

branches/auto/src/test/parse-fail/keyword-match-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py match'
1414

1515
fn main() {
16-
let match = "foo"; //~ error: ident
16+
let match = "foo"; //~ error: expected pattern, found keyword `match`
1717
}

branches/auto/src/test/parse-fail/keyword-mod-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py mod'
1414

1515
fn main() {
16-
let mod = "foo"; //~ error: ident
16+
let mod = "foo"; //~ error: expected pattern, found keyword `mod`
1717
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// compile-flags: -Z parse-only
12+
13+
// This file was auto-generated using 'src/etc/generate-keyword-tests.py move'
14+
15+
fn main() {
16+
let move = "foo"; //~ error: expected pattern, found keyword `move`
17+
}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -10,8 +10,6 @@
1010

1111
// compile-flags: -Z parse-only
1212

13-
// This file was auto-generated using 'src/etc/generate-keyword-tests.py mut'
14-
1513
fn main() {
16-
let mut = "foo"; //~ error: ident
14+
let mut = "foo"; //~ error: expected identifier, found `=`
1715
}

branches/auto/src/test/parse-fail/keyword-pub-as-identifier.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -13,5 +13,5 @@
1313
// This file was auto-generated using 'src/etc/generate-keyword-tests.py pub'
1414

1515
fn main() {
16-
let pub = "foo"; //~ error: ident
16+
let pub = "foo"; //~ error: expected pattern, found keyword `pub`
1717
}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -10,8 +10,6 @@
1010

1111
// compile-flags: -Z parse-only
1212

13-
// This file was auto-generated using 'src/etc/generate-keyword-tests.py ref'
14-
1513
fn main() {
16-
let ref = "foo"; //~ error: ident
14+
let ref = "foo"; //~ error: expected identifier, found `=`
1715
}

0 commit comments

Comments
 (0)