---

yaml
---
r: 160095
b: refs/heads/try
c: 28b1b2e
h: refs/heads/master
i:
  160093: df5ce87
  160091: 408c075
  160087: 059bc93
  160079: 3221ea6
  160063: 3e5e91f
v: v3

Author: Jakub Bukaj

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: e09d98603e608c9e47d4c89f7b4dca87a4b56da3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9c96a79a74f10bed18b031ce0ac4126c56d6cfb3
-refs/heads/try: eb01b17b06eb35542bb80ff7456043b0ed5572ba
+refs/heads/try: 28b1b2ec393fb3c76543d7ee46b2cb2d7954b6da
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/test/compile-fail/issue-16939.rs

@@ -14,7 +14,7 @@
 // wrong arity.
 
 fn _foo<F: Fn()> (f: F) {
-    |t| f(t); //~ ERROR E0058
+    |t| f(t); //~ ERROR E0057
 }
 
 fn main() {}

branches/try/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs

@@ -12,5 +12,5 @@ enum State { ST_NULL, ST_WHITESPACE }
 
 fn main() {
     [ST_NULL, ..(ST_WHITESPACE as uint)];
-    //~^ ERROR expected constant integer for repeat count, found variable
+    //~^ ERROR expected constant integer for repeat count, found non-constant expression
 }

branches/try/src/test/compile-fail/repeat_count.rs

@@ -13,8 +13,9 @@
 fn main() {
     let n = 1;
     let a = [0, ..n]; //~ ERROR expected constant integer for repeat count, found variable
-    let b = [0, ..()]; //~ ERROR expected positive integer for repeat count, found ()
-    //~^ ERROR: expected `uint`, found `()`
+    let b = [0, ..()];
+//~^ ERROR expected constant integer for repeat count, found non-constant expression
+//~^^ ERROR: expected `uint`, found `()`
     let c = [0, ..true]; //~ ERROR expected positive integer for repeat count, found boolean
     //~^ ERROR: expected `uint`, found `bool`
     let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count, found float

branches/try/src/test/run-pass/concat.rs

@@ -15,12 +15,12 @@ pub fn main() {
     assert_eq!(concat!("qux", "quux",).to_string(), "quxquux".to_string());
 
     assert_eq!(
-        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()),
+        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true),
         "12344.0atrue"
     );
 
     assert!(match "12344.0atrue" {
-        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()) => true,
+        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true) => true,
         _ => false
     })
 }