forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#121975 - davidtwco:issue-121757, r=petroche…
…nkov hir_analysis: enums return `None` in `find_field` Fixes rust-lang#121757. Unnamed union fields with enums are checked for, but if `find_field` causes an ICE then the compiler won't get to that point.
Showing
3 changed files
with
76 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
tests/ui/union/unnamed-fields/unnamed-enum-field-issue-121757.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
type NodeId = u32; | ||
struct Type<'a>(std::marker::PhantomData::<&'a ()>); | ||
|
||
type Ast<'ast> = &'ast AstStructure<'ast>; | ||
|
||
struct AstStructure<'ast> { | ||
//~^ ERROR struct with unnamed fields must have `#[repr(C)]` representation | ||
id: NodeId, | ||
_: AstKind<'ast> | ||
//~^ ERROR unnamed fields are not yet fully implemented [E0658] | ||
//~^^ ERROR unnamed fields can only have struct or union types | ||
} | ||
|
||
enum AstKind<'ast> { | ||
ExprInt, | ||
ExprLambda(Ast<'ast>), | ||
} | ||
|
||
fn compute_types<'tcx,'ast>(ast: Ast<'ast>) -> Type<'tcx> | ||
{ | ||
match ast.kind {} | ||
//~^ ERROR no field `kind` on type `&'ast AstStructure<'ast>` [E0609] | ||
} | ||
|
||
fn main() {} |
45 changes: 45 additions & 0 deletions
45
tests/ui/union/unnamed-fields/unnamed-enum-field-issue-121757.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
error[E0658]: unnamed fields are not yet fully implemented | ||
--> $DIR/unnamed-enum-field-issue-121757.rs:9:5 | ||
| | ||
LL | _: AstKind<'ast> | ||
| ^ | ||
| | ||
= note: see issue #49804 <https://github.com/rust-lang/rust/issues/49804> for more information | ||
= help: add `#![feature(unnamed_fields)]` to the crate attributes to enable | ||
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date | ||
|
||
error: struct with unnamed fields must have `#[repr(C)]` representation | ||
--> $DIR/unnamed-enum-field-issue-121757.rs:6:1 | ||
| | ||
LL | struct AstStructure<'ast> { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ struct `AstStructure` defined here | ||
| | ||
note: unnamed field defined here | ||
--> $DIR/unnamed-enum-field-issue-121757.rs:9:5 | ||
| | ||
LL | _: AstKind<'ast> | ||
| ^^^^^^^^^^^^^^^^ | ||
help: add `#[repr(C)]` to this struct | ||
| | ||
LL + #[repr(C)] | ||
LL | struct AstStructure<'ast> { | ||
| | ||
|
||
error: unnamed fields can only have struct or union types | ||
--> $DIR/unnamed-enum-field-issue-121757.rs:9:5 | ||
| | ||
LL | _: AstKind<'ast> | ||
| ^^^^^^^^^^^^^^^^ | ||
|
||
error[E0609]: no field `kind` on type `&'ast AstStructure<'ast>` | ||
--> $DIR/unnamed-enum-field-issue-121757.rs:21:15 | ||
| | ||
LL | match ast.kind {} | ||
| ^^^^ unknown field | ||
| | ||
= note: available fields are: `id`, `_` | ||
|
||
error: aborting due to 4 previous errors | ||
|
||
Some errors have detailed explanations: E0609, E0658. | ||
For more information about an error, try `rustc --explain E0609`. |