rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

More trivial tweaks

Browse Source
This commit is contained in:
Michael Goulet
2025-04-07 05:07:02 +00:00
parent 25a615bf82
commit c51c448fae
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_hir_analysis/src/check/region.rs
View File

@@ -446,14 +446,11 @@ fn resolve_expr<'tcx>(
// Mark this expr's scope and all parent scopes as containing `yield`. // Mark this expr's scope and all parent scopes as containing `yield`.
let mut scope = Scope { local_id: expr.hir_id.local_id, data: ScopeData::Node }; let mut scope = Scope { local_id: expr.hir_id.local_id, data: ScopeData::Node };
loop { loop {
let span = match expr.kind { let data = YieldData {
hir::ExprKind::Yield(expr, hir::YieldSource::Await { .. }) => { span: expr.span,
expr.span.shrink_to_hi().to(expr.span) expr_and_pat_count: visitor.expr_and_pat_count,
} source: *source,
_ => expr.span,
}; };
let data =
YieldData { span, expr_and_pat_count: visitor.expr_and_pat_count, source: *source };
match visitor.scope_tree.yield_in_scope.get_mut(&scope) { match visitor.scope_tree.yield_in_scope.get_mut(&scope) {
Some(yields) => yields.push(data), Some(yields) => yields.push(data),
None => { None => {

5
compiler/rustc_hir_typeck/src/demand.rs
View File

@@ -865,10 +865,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// `&'name Ty` -> `&'name mut Ty` or `&Ty` -> `&mut Ty` // `&'name Ty` -> `&'name mut Ty` or `&Ty` -> `&mut Ty`
vec![( vec![(
ty_ref.1.ty.span.shrink_to_lo(), ty_ref.1.ty.span.shrink_to_lo(),
format!( format!("{}mut ", if ty_ref.0.ident.span.is_empty() { "" } else { " " },),
"{}mut ",
if ty_ref.0.ident.span.lo() == ty_ref.0.ident.span.hi() { "" } else { " " },
),
)] )]
}; };
sugg.extend([ sugg.extend([

2
compiler/rustc_passes/src/liveness.rs
View File

@@ -1655,7 +1655,7 @@ impl<'tcx> Liveness<'_, 'tcx> {
// `&'name Ty` -> `&'name mut Ty` or `&Ty` -> `&mut Ty` // `&'name Ty` -> `&'name mut Ty` or `&Ty` -> `&mut Ty`
Some(mut_ty.ty.span.shrink_to_lo()) Some(mut_ty.ty.span.shrink_to_lo())
}; };
let pre = if lt.ident.span.lo() == lt.ident.span.hi() { "" } else { " " }; let pre = if lt.ident.span.is_empty() { "" } else { " " };
Some(errors::UnusedAssignSuggestion { Some(errors::UnusedAssignSuggestion {
ty_span, ty_span,
pre, pre,