Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Flatten nested tuple destructuring

Browse Source
This commit is contained in:
lapla
2026-04-13 11:36:12 +09:00
parent a687f0b658
commit 90c03d8ff4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_resolve/src/diagnostics.rs
+8 -5
View File
@@ -979,7 +979,7 @@ pub(crate) fn into_struct_error(
.source_map()
.span_extend_to_prev_str(ident.span, current, true, false);
let ((with, with_label), without) = match sp {
let (with, with_label, without) = match sp {
Some(sp) if !self.tcx.sess.source_map().is_multiline(sp) => {
let sp = sp
.with_lo(BytePos(sp.lo().0 - (current.len() as u32)))
@@ -1000,23 +1000,26 @@ pub(crate) fn into_struct_error(
if is_simple_binding {
(
(Some(errs::AttemptToUseNonConstantValueInConstantWithSuggestion {
Some(errs::AttemptToUseNonConstantValueInConstantWithSuggestion {
span: sp,
suggestion,
current,
type_span,
}), Some(errs::AttemptToUseNonConstantValueInConstantLabelWithSuggestion {span})),
}),
Some(errs::AttemptToUseNonConstantValueInConstantLabelWithSuggestion { span }),
None,
)
} else {
(
(None, Some(errs::AttemptToUseNonConstantValueInConstantLabelWithSuggestion {span})),
None,
Some(errs::AttemptToUseNonConstantValueInConstantLabelWithSuggestion { span }),
None,
)
}
}
_ => (
(None, None),
None,
None,
Some(errs::AttemptToUseNonConstantValueInConstantWithoutSuggestion {
ident_span: ident.span,
suggestion,