---

yaml
---
r: 13623
b: refs/heads/master
c: bb572b4
h: refs/heads/master
i:
  13621: 164fae9
  13619: 447e544
  13615: 7b184e6
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f21fbc23d28eebccb903540740212c6e191d1ecc
+refs/heads/master: bb572b4234df9c206ed97606c9e1c2dd40e06dab
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/test/compile-fail/vec-add.rs

@@ -6,23 +6,23 @@ fn add(i: [int], m: [mut int], c: [const int]) {
 
    add(i + [3],
        m + [3],
-       c + [3]);
+       [3]);
 
    add(i + [mut 3],
        m + [mut 3],
-       c + [mut 3]);
+       [mut 3]);
 
    add(i + i,
        m + i,
-       c + i);
+       i);
 
    add(i + m,
        m + m,
-       c + m);
+       m);
 
    add(i + c,
        m + c,
-       c + c);
+       c);
 
    add(m + [3], //! ERROR mismatched types
        m + [3],
@@ -33,8 +33,10 @@ fn add(i: [int], m: [mut int], c: [const int]) {
        i + [3]);
 
    add(c + [3], //! ERROR mismatched types
-       c + [3], //! ERROR mismatched types
-       c + [3]);
+                //!^ ERROR binary operation + cannot be applied
+       c + [3], //! ERROR binary operation + cannot be applied
+                //!^ mismatched types
+       [3]);
 
    add(m + [mut 3], //! ERROR mismatched types
        m + [mut 3],
@@ -44,9 +46,11 @@ fn add(i: [int], m: [mut int], c: [const int]) {
        i + [mut 3], //! ERROR mismatched types
        i + [mut 3]);
 
-   add(c + [mut 3], //! ERROR mismatched types
-       c + [mut 3], //! ERROR mismatched types
-       c + [mut 3]);
+   add(c + [mut 3], //! ERROR binary operation + cannot be applied
+                    //!^ mismatched types
+       c + [mut 3], //! ERROR binary operation + cannot be applied
+                    //!^ mismatched types
+       [mut 3]);
 
    add(m + i, //! ERROR mismatched types
        m + i,
@@ -56,9 +60,11 @@ fn add(i: [int], m: [mut int], c: [const int]) {
        i + i, //! ERROR mismatched types
        i + i);
 
-   add(c + i, //! ERROR mismatched types
-       c + i, //! ERROR mismatched types
-       c + i);
+   add(c + i, //! ERROR binary operation + cannot be applied
+              //!^ ERROR mismatched types
+       c + i, //! ERROR binary operation + cannot be applied
+              //!^ ERROR mismatched types
+       i);
 
    add(m + m, //! ERROR mismatched types
        m + m,
@@ -68,9 +74,11 @@ fn add(i: [int], m: [mut int], c: [const int]) {
        i + m, //! ERROR mismatched types
        i + m);
 
-   add(c + m, //! ERROR mismatched types
-       c + m, //! ERROR mismatched types
-       c + m);
+   add(c + m, //! ERROR binary operation + cannot be applied
+              //!^ ERROR mismatched types
+       c + m, //! ERROR binary operation + cannot be applied
+              //!^ ERROR mismatched types
+       m);
 
    add(m + c, //! ERROR mismatched types
        m + c,
@@ -80,9 +88,11 @@ fn add(i: [int], m: [mut int], c: [const int]) {
        i + c, //! ERROR mismatched types
        i + c);
 
-   add(c + c, //! ERROR mismatched types
-       c + c, //! ERROR mismatched types
-       c + c);
+   add(c + c, //! ERROR binary operation + cannot be applied
+              //!^ ERROR mismatched types
+       c + c, //! ERROR binary operation + cannot be applied
+              //!^ ERROR mismatched types
+       c);
 }
 
 fn main() {