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

trivial style fix

Browse Source
This commit is contained in:
yukang 2023-08-02 09:56:02 +08:00
parent f77c624c03
commit 026c4b6a65
1 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
compiler/rustc_resolve/src/late/diagnostics.rs
View File

@ -555,7 +555,6 @@ fn try_lookup_name_relaxed(
} }
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let crate_def_id = CRATE_DEF_ID.to_def_id();
// Try to filter out intrinsics candidates, as long as we have // Try to filter out intrinsics candidates, as long as we have
// some other candidates to suggest. // some other candidates to suggest.
let intrinsic_candidates: Vec<_> = candidates let intrinsic_candidates: Vec<_> = candidates
@ -566,8 +565,9 @@ fn try_lookup_name_relaxed(
.collect(); .collect();
if candidates.is_empty() { if candidates.is_empty() {
// Put them back if we have no more candidates to suggest... // Put them back if we have no more candidates to suggest...
candidates.extend(intrinsic_candidates); candidates = intrinsic_candidates;
} }
let crate_def_id = CRATE_DEF_ID.to_def_id();
if candidates.is_empty() && is_expected(Res::Def(DefKind::Enum, crate_def_id)) { if candidates.is_empty() && is_expected(Res::Def(DefKind::Enum, crate_def_id)) {
let mut enum_candidates: Vec<_> = self let mut enum_candidates: Vec<_> = self
.r .r
@ -1008,7 +1008,7 @@ fn suggest_swapping_misplaced_self_ty_and_trait(
span: Span, span: Span,
) { ) {
if let Some((trait_ref, self_ty)) = if let Some((trait_ref, self_ty)) =
self.diagnostic_metadata.currently_processing_impl_trait.clone() self.diagnostic_metadata.currently_processing_impl_trait.clone()
&& let TyKind::Path(_, self_ty_path) = &self_ty.kind && let TyKind::Path(_, self_ty_path) = &self_ty.kind
&& let PathResult::Module(ModuleOrUniformRoot::Module(module)) = && let PathResult::Module(ModuleOrUniformRoot::Module(module)) =
self.resolve_path(&Segment::from_path(self_ty_path), Some(TypeNS), None) self.resolve_path(&Segment::from_path(self_ty_path), Some(TypeNS), None)
@ -1180,37 +1180,34 @@ fn restrict_assoc_type_in_where_clause(&mut self, span: Span, err: &mut Diagnost
/// return the span of whole call and the span for all arguments expect the first one (`self`). /// return the span of whole call and the span for all arguments expect the first one (`self`).
fn call_has_self_arg(&self, source: PathSource<'_>) -> Option<(Span, Option<Span>)> { fn call_has_self_arg(&self, source: PathSource<'_>) -> Option<(Span, Option<Span>)> {
let mut has_self_arg = None; let mut has_self_arg = None;
if let PathSource::Expr(Some(parent)) = source { if let PathSource::Expr(Some(parent)) = source
match &parent.kind { && let ExprKind::Call(_, args) = &parent.kind
ExprKind::Call(_, args) if !args.is_empty() => { && !args.is_empty() {
let mut expr_kind = &args[0].kind; let mut expr_kind = &args[0].kind;
loop { loop {
match expr_kind { match expr_kind {
ExprKind::Path(_, arg_name) if arg_name.segments.len() == 1 => { ExprKind::Path(_, arg_name) if arg_name.segments.len() == 1 => {
if arg_name.segments[0].ident.name == kw::SelfLower { if arg_name.segments[0].ident.name == kw::SelfLower {
let call_span = parent.span; let call_span = parent.span;
let tail_args_span = if args.len() > 1 { let tail_args_span = if args.len() > 1 {
Some(Span::new( Some(Span::new(
args[1].span.lo(), args[1].span.lo(),
args.last().unwrap().span.hi(), args.last().unwrap().span.hi(),
call_span.ctxt(), call_span.ctxt(),
None, None,
)) ))
} else { } else {
None None
}; };
has_self_arg = Some((call_span, tail_args_span)); has_self_arg = Some((call_span, tail_args_span));
}
break;
} }
ExprKind::AddrOf(_, _, expr) => expr_kind = &expr.kind, break;
_ => break,
} }
ExprKind::AddrOf(_, _, expr) => expr_kind = &expr.kind,
_ => break,
} }
} }
_ => (), }
}
};
has_self_arg has_self_arg
} }