nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-31 06:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix borrowck errors

Browse Source 
Reborrowing doesn't work for loops
This commit is contained in:
AnthonyMikh 2019-10-01 03:22:07 +03:00 committed by GitHub
parent fdce4168fc
commit 50c2a58d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_errors/emitter.rs
View File

@ -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