diff options
| author | varkor <github@varkor.com> | 2020-12-30 15:34:53 +0000 |
|---|---|---|
| committer | kadmin <julianknodt@gmail.com> | 2021-03-23 17:16:20 +0000 |
| commit | 8ef81388e2def7b12d3b527705bf32402c8d7c8a (patch) | |
| tree | c9aa6da68f23fcf67e738005809e476de4887eba /src/test/ui/const-generics | |
| parent | e4e5db4e4207e21c38c07640d44005dab022f1b8 (diff) | |
| download | rust-8ef81388e2def7b12d3b527705bf32402c8d7c8a.tar.gz rust-8ef81388e2def7b12d3b527705bf32402c8d7c8a.zip | |
Some refactoring
Diffstat (limited to 'src/test/ui/const-generics')
4 files changed, 11 insertions, 16 deletions
diff --git a/src/test/ui/const-generics/defaults/const-default.rs b/src/test/ui/const-generics/defaults/const-default.rs index b2286e7d5bd..00410224de5 100644 --- a/src/test/ui/const-generics/defaults/const-default.rs +++ b/src/test/ui/const-generics/defaults/const-default.rs @@ -5,10 +5,7 @@ #![allow(incomplete_features)] -#[derive(Default)] -pub struct ConstDefault<const N: usize = 3> { - items: [u32; N] -} +pub struct ConstDefault<const N: usize = 3> {} pub fn main() { let s = ConstDefault::default(); diff --git a/src/test/ui/const-generics/min_const_generics/default_function_param.rs b/src/test/ui/const-generics/min_const_generics/default_function_param.rs index e4044eaaa7c..52803c5b726 100644 --- a/src/test/ui/const-generics/min_const_generics/default_function_param.rs +++ b/src/test/ui/const-generics/min_const_generics/default_function_param.rs @@ -1,7 +1,6 @@ -#![feature(const_generic_defaults)] +#![crate_type = "lib"] +#![feature(const_generics_defaults)] #![feature(min_const_generics)] +#![allow(incomplete_features)] -fn foo<const SIZE: usize = 5>() {} -//~^ ERROR default values for const generic parameters are experimental - -fn main() {} +fn foo<const SIZE: usize = 5usize>() {} diff --git a/src/test/ui/const-generics/min_const_generics/default_function_param.stderr b/src/test/ui/const-generics/min_const_generics/default_function_param.stderr index 31b5ad5123e..c7148e8ec07 100644 --- a/src/test/ui/const-generics/min_const_generics/default_function_param.stderr +++ b/src/test/ui/const-generics/min_const_generics/default_function_param.stderr @@ -1,12 +1,9 @@ -error[E0658]: default values for const generic parameters are experimental - --> $DIR/default_function_param.rs:1:26 +error[E0282]: type annotations needed + --> $DIR/default_function_param.rs:6:28 | LL | fn foo<const SIZE: usize = 5>() {} - | ^^^ - | - = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information - = help: add `#![feature(const_generics_defaults)]` to the crate attributes to enable + | ^ cannot infer type for type `{integer}` error: aborting due to previous error -For more information about this error, try `rustc --explain E0658`. +For more information about this error, try `rustc --explain E0282`. diff --git a/src/test/ui/const-generics/min_const_generics/default_trait_param.rs b/src/test/ui/const-generics/min_const_generics/default_trait_param.rs index c3581aca1cf..14bac473ed9 100644 --- a/src/test/ui/const-generics/min_const_generics/default_trait_param.rs +++ b/src/test/ui/const-generics/min_const_generics/default_trait_param.rs @@ -1,2 +1,4 @@ trait Foo<const KIND: bool = true> {} //~^ ERROR default values for const generic parameters are experimental + +fn main() {} |