Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The previous test was incorrect. `const fn`s are *always* promotable when inside a `const`, so it should pass. The error was caused by a bug in `promote_consts`. I've added a failing test outside a `const` alongside the existing one, which is now run-pass.
- Loading branch information
1 parent
53712f8
commit fcf4bee
Showing
4 changed files
with
44 additions
and
29 deletions.
There are no files selected for viewing
26 changes: 0 additions & 26 deletions
26
src/test/ui/consts/rfc-2203-const-array-repeat-exprs/const-fns.rs
This file was deleted.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
src/test/ui/consts/rfc-2203-const-array-repeat-exprs/fn-call-in-const.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,23 @@ | ||
// run-pass | ||
|
||
#![allow(unused)] | ||
#![feature(const_in_array_repeat_expressions)] | ||
|
||
// Some type that is not copyable. | ||
struct Bar; | ||
|
||
const fn type_no_copy() -> Option<Bar> { | ||
None | ||
} | ||
|
||
const fn type_copy() -> u32 { | ||
3 | ||
} | ||
|
||
const _: [u32; 2] = [type_copy(); 2]; | ||
|
||
// This is allowed because all promotion contexts use the explicit rules for promotability when | ||
// inside an explicit const context. | ||
const _: [Option<Bar>; 2] = [type_no_copy(); 2]; | ||
|
||
fn main() {} |
18 changes: 18 additions & 0 deletions
18
src/test/ui/consts/rfc-2203-const-array-repeat-exprs/fn-call-in-non-const.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,18 @@ | ||
#![feature(const_in_array_repeat_expressions)] | ||
|
||
// Some type that is not copyable. | ||
struct Bar; | ||
|
||
const fn no_copy() -> Option<Bar> { | ||
None | ||
} | ||
|
||
const fn copy() -> u32 { | ||
3 | ||
} | ||
|
||
fn main() { | ||
let _: [u32; 2] = [copy(); 2]; | ||
let _: [Option<Bar>; 2] = [no_copy(); 2]; | ||
//~^ ERROR the trait bound `std::option::Option<Bar>: std::marker::Copy` is not satisfied | ||
} |
6 changes: 3 additions & 3 deletions
6
...const-array-repeat-exprs/const-fns.stderr → ...-repeat-exprs/fn-call-in-non-const.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