bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Account for union

Browse source
This commit is contained in:
Hirochika Matsumoto 2021-01-30 14:18:50 +09:00
parent 08d31e0f09
commit 2ce2d145c2
4 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View file

@ -1842,13 +1842,20 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
{
if let ObligationCauseCode::Pattern { span: Some(span), .. } = cause.code {
if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
let suggestion = if expected_def.is_struct() {
format!("{}.{}", snippet, name)
} else if expected_def.is_union() {
format!("unsafe {{ {}.{} }}", snippet, name)
} else {
return;
};
diag.span_suggestion(
span,
&format!(
"you might have meant to use field `{}` of type `{}`",
name, ty
),
format!("{}.{}", snippet, name),
suggestion,
Applicability::MaybeIncorrect,
);
}

12
src/test/ui/suggestions/field-access.fixed
View file

@ -10,6 +10,11 @@ enum B {
Snd,
}
union Foo {
bar: u32,
qux: f32,
}
fn main() {
let a = A { b: B::Fst };
if let B::Fst = a.b {}; //~ ERROR mismatched types [E0308]
@ -20,4 +25,11 @@ fn main() {
B::Fst => (), //~ ERROR mismatched types [E0308]
B::Snd => (), //~ ERROR mismatched types [E0308]
}
let foo = Foo { bar: 42 };
match unsafe { foo.bar } {
//~^ HELP you might have meant to use field `bar` of type `u32`
1u32 => (), //~ ERROR mismatched types [E0308]
_ => (),
}
}

12
src/test/ui/suggestions/field-access.rs
View file

@ -10,6 +10,11 @@ enum B {
Snd,
}
union Foo {
bar: u32,
qux: f32,
}
fn main() {
let a = A { b: B::Fst };
if let B::Fst = a {}; //~ ERROR mismatched types [E0308]
@ -20,4 +25,11 @@ fn main() {
B::Fst => (), //~ ERROR mismatched types [E0308]
B::Snd => (), //~ ERROR mismatched types [E0308]
}
let foo = Foo { bar: 42 };
match foo {
//~^ HELP you might have meant to use field `bar` of type `u32`
1u32 => (), //~ ERROR mismatched types [E0308]
_ => (),
}
}

22
src/test/ui/suggestions/field-access.stderr
View file

@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/field-access.rs:15:12
--> $DIR/field-access.rs:20:12
|
LL | Fst,
| --- unit variant defined here
@ -15,7 +15,7 @@ LL | if let B::Fst = a.b {};
| ^^^
error[E0308]: mismatched types
--> $DIR/field-access.rs:20:9
--> $DIR/field-access.rs:25:9
|
LL | Fst,
| --- unit variant defined here
@ -32,7 +32,7 @@ LL | match a.b {
| ^^^
error[E0308]: mismatched types
--> $DIR/field-access.rs:21:9
--> $DIR/field-access.rs:26:9
|
LL | Snd,
| --- unit variant defined here
@ -48,6 +48,20 @@ help: you might have meant to use field `b` of type `B`
LL | match a.b {
| ^^^
error: aborting due to 3 previous errors
error[E0308]: mismatched types
--> $DIR/field-access.rs:32:9
|
LL | match foo {
| --- this expression has type `Foo`
LL |
LL | 1u32 => (),
| ^^^^ expected union `Foo`, found `u32`
|
help: you might have meant to use field `bar` of type `u32`
|
LL | match unsafe { foo.bar } {
| ^^^^^^^^^^^^^^^^^^
error: aborting due to 4 previous errors
For more information about this error, try `rustc --explain E0308`.