mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #122969 - cuviper:borrowck-rposition, r=matthewjasper

Browse Source 
Simplify an iterator search in borrowck diag

Rather than `.into_iter().rev().find_position(...)`, this case can
simply call `.iter().rposition(...)`.
This commit is contained in:
Jubilee 2024-03-23 22:59:43 -07:00 committed by GitHub
commit c94d229337
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/rustc_borrowck/src/diagnostics/mod.rs
View File

@ -4,7 +4,6 @@
CaptureArgLabel, CaptureReasonLabel, CaptureReasonNote, CaptureReasonSuggest, CaptureVarCause, CaptureArgLabel, CaptureReasonLabel, CaptureReasonNote, CaptureReasonSuggest, CaptureVarCause,
CaptureVarKind, CaptureVarPathUseCause, OnClosureNote, CaptureVarKind, CaptureVarPathUseCause, OnClosureNote,
}; };
use itertools::Itertools;
use rustc_errors::{Applicability, Diag}; use rustc_errors::{Applicability, Diag};
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def::{CtorKind, Namespace}; use rustc_hir::def::{CtorKind, Namespace};
@ -226,16 +225,15 @@ pub(super) fn describe_place_with_options(
} }
} else { } else {
if autoderef_index.is_none() { if autoderef_index.is_none() {
autoderef_index = autoderef_index = match place.projection.iter().rposition(|elem| {
match place.projection.into_iter().rev().find_position(|elem| { !matches!(
!matches!( elem,
elem, ProjectionElem::Deref | ProjectionElem::Downcast(..)
ProjectionElem::Deref | ProjectionElem::Downcast(..) )
) }) {
}) { Some(index) => Some(index + 1),
Some((index, _)) => Some(place.projection.len() - index), None => Some(0),
None => Some(0), };
};
} }
if index >= autoderef_index.unwrap() { if index >= autoderef_index.unwrap() {
buf.insert(0, '*'); buf.insert(0, '*');