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

Avoid panic when debug info is missing

Browse Source
This commit is contained in:
Kornel
2025-06-22 16:49:38 +01:00
parent a30f1783fe
commit a7baff819d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_borrowck/src/diagnostics/move_errors.rs
View File

@@ -465,11 +465,15 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
if let PlaceRef { local, projection: [] } = deref_base { if let PlaceRef { local, projection: [] } = deref_base {
let decl = &self.body.local_decls[local]; let decl = &self.body.local_decls[local];
let local_name = self.local_names[local].map(|sym| format!("`{sym}`"));
if decl.is_ref_for_guard() { if decl.is_ref_for_guard() {
return self return self
.cannot_move_out_of( .cannot_move_out_of(
span, span,
&format!("`{}` in pattern guard", self.local_names[local].unwrap()), &format!(
"{} in pattern guard",
local_name.as_deref().unwrap_or("the place")
),
) )
.with_note( .with_note(
"variables bound in patterns cannot be moved from \ "variables bound in patterns cannot be moved from \
@@ -825,7 +829,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
} }
if binds_to.len() == 1 { if binds_to.len() == 1 {
let place_desc = &format!("`{}`", self.local_names[*local].unwrap()); let place_desc = self.local_names[*local].map(|sym| format!("`{sym}`"));
if let Some(expr) = self.find_expr(binding_span) { if let Some(expr) = self.find_expr(binding_span) {
self.suggest_cloning(err, bind_to.ty, expr, None); self.suggest_cloning(err, bind_to.ty, expr, None);
@@ -834,7 +838,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
err.subdiagnostic(crate::session_diagnostics::TypeNoCopy::Label { err.subdiagnostic(crate::session_diagnostics::TypeNoCopy::Label {
is_partial_move: false, is_partial_move: false,
ty: bind_to.ty, ty: bind_to.ty,
place: place_desc, place: place_desc.as_deref().unwrap_or("the place"),
span: binding_span, span: binding_span,
}); });
} }