nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #120646 - clubby789:uninit-destructuring-sugg, r=michaelwoerister

Browse Source 
Fix incorrect suggestion for uninitialized binding in pattern

Fixes #120634
This commit is contained in:
Matthias Krüger 2024-03-01 17:51:28 +01:00 committed by GitHub
commit 80549a8811
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View File

@ -613,7 +613,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
if self.sugg_span.is_some() {
return;
}
if let hir::StmtKind::Local(hir::Local { span, ty, init: None, .. }) = &ex.kind
// FIXME: We make sure that this is a normal top-level binding,
// but we could suggest `todo!()` for all uninitalized bindings in the pattern pattern
if let hir::StmtKind::Local(hir::Local { span, ty, init: None, pat, .. }) =
&ex.kind
&& let hir::PatKind::Binding(..) = pat.kind
&& span.contains(self.decl_span)
{
self.sugg_span = ty.map_or(Some(self.decl_span), |ty| Some(ty.span));

13
tests/ui/borrowck/borrowck-uninit.rs
View File

@ -3,4 +3,17 @@ fn foo(x: isize) { println!("{}", x); }
fn main() {
let x: isize;
foo(x); //~ ERROR E0381
// test for #120634
struct A(u8);
struct B { d: u8 }
let (a, );
let [b, ];
let A(c);
let B { d };
let _: (u8, u8, u8, u8) = (a, b, c, d);
//~^ ERROR used binding `a`
//~| ERROR used binding `b`
//~| ERROR used binding `c`
//~| ERROR used binding `d`
}

37
tests/ui/borrowck/borrowck-uninit.stderr
View File

@ -11,6 +11,41 @@ help: consider assigning a value
LL | let x: isize = 0;
| +++
error: aborting due to 1 previous error
error[E0381]: used binding `a` isn't initialized
--> $DIR/borrowck-uninit.rs:14:32
|
LL | let (a, );
| - binding declared here but left uninitialized
...
LL | let _: (u8, u8, u8, u8) = (a, b, c, d);
| ^ `a` used here but it isn't initialized
error[E0381]: used binding `b` isn't initialized
--> $DIR/borrowck-uninit.rs:14:35
|
LL | let [b, ];
| - binding declared here but left uninitialized
...
LL | let _: (u8, u8, u8, u8) = (a, b, c, d);
| ^ `b` used here but it isn't initialized
error[E0381]: used binding `c` isn't initialized
--> $DIR/borrowck-uninit.rs:14:38
|
LL | let A(c);
| - binding declared here but left uninitialized
LL | let B { d };
LL | let _: (u8, u8, u8, u8) = (a, b, c, d);
| ^ `c` used here but it isn't initialized
error[E0381]: used binding `d` isn't initialized
--> $DIR/borrowck-uninit.rs:14:41
|
LL | let B { d };
| - binding declared here but left uninitialized
LL | let _: (u8, u8, u8, u8) = (a, b, c, d);
| ^ `d` used here but it isn't initialized
error: aborting due to 5 previous errors
For more information about this error, try `rustc --explain E0381`.