diff options
| author | Jonathan Turner <jturner@mozilla.com> | 2016-08-17 14:26:05 -0700 |
|---|---|---|
| committer | Jonathan Turner <jturner@mozilla.com> | 2016-08-17 14:26:05 -0700 |
| commit | d0a272b797fd538c4b4230bdefea534af8c1ffde (patch) | |
| tree | be515b4678a6d1af9d4f9ab43f1055a5f1c52806 | |
| parent | 7ac11cad3fe85163dd8b0ca1f63af492509f9bfe (diff) | |
| download | rust-d0a272b797fd538c4b4230bdefea534af8c1ffde.tar.gz rust-d0a272b797fd538c4b4230bdefea534af8c1ffde.zip | |
Fix merge conflict
| -rw-r--r-- | src/test/ui/mismatched_types/issue-26480.stderr | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/src/test/ui/mismatched_types/issue-26480.stderr index 13f23a5d01a..19caea27cff 100644 --- 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 |