From 50c2a58d086ec9124a6749eb75afc35c0bc1652f Mon Sep 17 00:00:00 2001 From: AnthonyMikh Date: Tue, 1 Oct 2019 03:22:07 +0300 Subject: [PATCH] Fix borrowck errors Reborrowing doesn't work for loops --- src/librustc_errors/emitter.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs index 263ffb0d17c..0c7aa3582ac 100644 --- a/src/librustc_errors/emitter.rs +++ b/src/librustc_errors/emitter.rs @@ -760,7 +760,7 @@ impl EmitterWriter { annotations_position.push((p, annotation)); for (j, next) in annotations.iter().enumerate() { if j > i { - let l = next.label.map_or(0, |label| label.len() + 2); + let l = next.label.as_ref().map_or(0, |label| label.len() + 2); if (overlaps(next, annotation, l) // Do not allow two labels to be in the same // line if they overlap including padding, to // avoid situations like: @@ -1655,7 +1655,7 @@ impl FileWithAnnotatedLines { line_index: usize, ann: Annotation) { - for slot in file_vec { + for slot in file_vec.iter_mut() { // Look through each of our files for the one we're adding to if slot.file.name == file.name { // See if we already have a line for it