Fix merge conflict

rust-lang · Aug 17, 2016 · d0a272b · d0a272b
1 parent 7ac11ca
commit d0a272b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/src/test/ui/mismatched_types/issue-26480.stderr
@@ -3,14 +3,18 @@ error[E0308]: mismatched types
    |
 26 |                   $arr.len() * size_of($arr[0]));
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected u64, found usize
-$DIR/issue-26480.rs:37:5: 37:19 note: in this expansion of write! (defined in $DIR/issue-26480.rs)
+...
+38 |     write!(hello);
+   |     -------------- in this macro invocation
 
 error: non-scalar cast: `{integer}` as `()`
   --> $DIR/issue-26480.rs:32:19
    |
 32 |     ($x:expr) => ($x as ())
    |                   ^^^^^^^^
-$DIR/issue-26480.rs:38:5: 38:14 note: in this expansion of cast! (defined in $DIR/issue-26480.rs)
+...
+39 |     cast!(2);
+   |     --------- in this macro invocation
 
 error: aborting due to 2 previous errors