-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make get_return_block() return Some only for HIR nodes in body
Fixes # 114918
- Loading branch information
Showing
9 changed files
with
103 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
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,10 @@ | ||
// Regression test for #114918 | ||
// Test that a const generic enclosed in a block within a return type | ||
// produces a type mismatch error instead of triggering a const eval cycle | ||
|
||
#[allow(unused_braces)] | ||
fn func() -> [u8; { () } ] { //~ ERROR mismatched types | ||
loop {} | ||
} | ||
|
||
fn main() {} |
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,9 @@ | ||
error[E0308]: mismatched types | ||
--> $DIR/const-in-fn-return-type.rs:6:21 | ||
| | ||
LL | fn func() -> [u8; { () } ] { | ||
| ^^ expected `usize`, found `()` | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0308`. |
20 changes: 20 additions & 0 deletions
20
tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.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,20 @@ | ||
// Regression test for #114918 | ||
// Test that a const generic enclosed in a block within the return type | ||
// of an impl fn produces a type mismatch error instead of triggering | ||
// a const eval cycle | ||
|
||
|
||
trait Trait { | ||
fn func<const N: u32>() -> [ (); N ]; | ||
} | ||
|
||
struct S {} | ||
|
||
#[allow(unused_braces)] | ||
impl Trait for S { | ||
fn func<const N: u32>() -> [ (); { () }] { //~ ERROR mismatched types | ||
N | ||
} | ||
} | ||
|
||
fn main() {} |
9 changes: 9 additions & 0 deletions
9
tests/ui/typeck/issue-114918/const-in-impl-fn-return-type.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,9 @@ | ||
error[E0308]: mismatched types | ||
--> $DIR/const-in-impl-fn-return-type.rs:15:40 | ||
| | ||
LL | fn func<const N: u32>() -> [ (); { () }] { | ||
| ^^ expected `usize`, found `()` | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0308`. |
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,12 @@ | ||
// Regression test for #114918 | ||
// Test that a const generic enclosed in a block in a struct's type arg | ||
// produces a type mismatch error instead of triggering a const eval cycle | ||
|
||
#[allow(unused_braces)] | ||
struct S<const N: usize> { | ||
arr: [u8; N] | ||
} | ||
|
||
fn main() { | ||
let s = S::<{ () }> { arr: [5, 6, 7]}; //~ ERROR mismatched types | ||
} |
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,9 @@ | ||
error[E0308]: mismatched types | ||
--> $DIR/const-in-struct-type-arg.rs:11:19 | ||
| | ||
LL | let s = S::<{ () }> { arr: [5, 6, 7]}; | ||
| ^^ expected `usize`, found `()` | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0308`. |
13 changes: 13 additions & 0 deletions
13
tests/ui/typeck/issue-114918/const-in-trait-fn-return-type.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,13 @@ | ||
// Regression test for #114918 | ||
// Test that a const generic enclosed in a block within the return type | ||
// of a trait method produces a type mismatch error instead of triggering | ||
// a const eval cycle | ||
|
||
#[allow(unused_braces)] | ||
trait Trait { | ||
fn func<const N: u32>() -> [ (); { () }] { //~ ERROR mismatched types | ||
N | ||
} | ||
} | ||
|
||
fn main() {} |
9 changes: 9 additions & 0 deletions
9
tests/ui/typeck/issue-114918/const-in-trait-fn-return-type.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,9 @@ | ||
error[E0308]: mismatched types | ||
--> $DIR/const-in-trait-fn-return-type.rs:8:40 | ||
| | ||
LL | fn func<const N: u32>() -> [ (); { () }] { | ||
| ^^ expected `usize`, found `()` | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0308`. |