about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-10 08:41:30 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-10 08:41:30 -0800
commit6cf75ca05aba0874ad78b62d6ead6f20f00d5d9f (patch)
treeee52c79ad5ebf8fc67bd8b08e0d44bacc3569c8f /src/test
parentdff8182ed259e28ecc0b8ce1a49cf7821332f242 (diff)
parent8f7c2d518d1892c98d2ef57992a65669834f24e2 (diff)
downloadrust-6cf75ca05aba0874ad78b62d6ead6f20f00d5d9f.tar.gz
rust-6cf75ca05aba0874ad78b62d6ead6f20f00d5d9f.zip
rollup merge of #21918: ranma42/replace-be
Conflicts:
	src/test/compile-fail/reserved-be.rs
	src/test/compile-fail/reserved-become.rs
	src/test/parse-fail/reserved-be.rs
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/reserved-become.rs (renamed from src/test/parse-fail/reserved-be.rs)6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/parse-fail/reserved-be.rs b/src/test/compile-fail/reserved-become.rs
index 386d53cc16e..82e9ebc10d1 100644
--- a/src/test/parse-fail/reserved-be.rs
+++ b/src/test/compile-fail/reserved-become.rs
@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    let be = 0;
-    //~^ ERROR `be` is a reserved keyword
+    let become = 0;
+    //~^ ERROR `become` is a reserved keyword
 }