diff options
| author | Jonathan Turner <jturner@mozilla.com> | 2016-08-17 15:11:18 -0700 |
|---|---|---|
| committer | Jonathan Turner <jturner@mozilla.com> | 2016-08-17 15:11:18 -0700 |
| commit | 54d42cc912d1510e561a4d4274e4f821becd1736 (patch) | |
| tree | cfc0e5966b485a97a5c581baeaa15ac6cf055f40 /src | |
| parent | 61865384b8fa6d79d2b36cbd7c899eaf15f4aeea (diff) | |
| download | rust-54d42cc912d1510e561a4d4274e4f821becd1736.tar.gz rust-54d42cc912d1510e561a4d4274e4f821becd1736.zip | |
Rebase. Fix mutable iteration nit.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_errors/emitter.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/mismatched_types/issue-26480.stderr | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs index 11c9c5b1d9c..5fd9226aba9 100644 --- a/src/librustc_errors/emitter.rs +++ b/src/librustc_errors/emitter.rs @@ -465,7 +465,7 @@ impl EmitterWriter { span: &mut MultiSpan, children: &mut Vec<SubDiagnostic>) { let mut spans_updated = self.fix_multispan_in_std_macros(span); - for child in &mut children.iter_mut() { + for child in children.iter_mut() { spans_updated |= self.fix_multispan_in_std_macros(&mut child.span); } if spans_updated { diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/src/test/ui/mismatched_types/issue-26480.stderr index 19caea27cff..5d07ee1648a 100644 --- a/src/test/ui/mismatched_types/issue-26480.stderr +++ b/src/test/ui/mismatched_types/issue-26480.stderr @@ -4,7 +4,7 @@ error[E0308]: mismatched types 26 | $arr.len() * size_of($arr[0])); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected u64, found usize ... -38 | write!(hello); +37 | write!(hello); | -------------- in this macro invocation error: non-scalar cast: `{integer}` as `()` @@ -13,7 +13,7 @@ error: non-scalar cast: `{integer}` as `()` 32 | ($x:expr) => ($x as ()) | ^^^^^^^^ ... -39 | cast!(2); +38 | cast!(2); | --------- in this macro invocation error: aborting due to 2 previous errors |