diff options
| author | varkor <github@varkor.com> | 2020-11-18 12:49:39 +0000 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2020-11-18 13:16:35 +0000 |
| commit | efcbf1b00bb8997f1e1ee0740640f67fbe32c615 (patch) | |
| tree | cd16352437a70f8f9d66ff8ece04c211dedaaf56 /src | |
| parent | c4f836ad1aceb83507810d9499f56988fd24578d (diff) | |
| download | rust-efcbf1b00bb8997f1e1ee0740640f67fbe32c615.tar.gz rust-efcbf1b00bb8997f1e1ee0740640f67fbe32c615.zip | |
Permit standalone generic parameters as const generic arguments in macros
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/const-generics/macro_rules-braces.full.stderr | 13 | ||||
| -rw-r--r-- | src/test/ui/const-generics/macro_rules-braces.min.stderr | 13 | ||||
| -rw-r--r-- | src/test/ui/const-generics/macro_rules-braces.rs | 2 |
3 files changed, 3 insertions, 25 deletions
diff --git a/src/test/ui/const-generics/macro_rules-braces.full.stderr b/src/test/ui/const-generics/macro_rules-braces.full.stderr index e5b67f61a25..273766b0b0e 100644 --- a/src/test/ui/const-generics/macro_rules-braces.full.stderr +++ b/src/test/ui/const-generics/macro_rules-braces.full.stderr @@ -1,15 +1,4 @@ error: expressions must be enclosed in braces to be used as const generic arguments - --> $DIR/macro_rules-braces.rs:34:17 - | -LL | let _: baz!(N); - | ^ - | -help: enclose the `const` expression in braces - | -LL | let _: baz!({ N }); - | ^ ^ - -error: expressions must be enclosed in braces to be used as const generic arguments --> $DIR/macro_rules-braces.rs:54:17 | LL | let _: baz!(10 + 7); @@ -68,5 +57,5 @@ LL | let _: biz!({ N }); = note: this may fail depending on what value the parameter takes = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) -error: aborting due to 6 previous errors +error: aborting due to 5 previous errors diff --git a/src/test/ui/const-generics/macro_rules-braces.min.stderr b/src/test/ui/const-generics/macro_rules-braces.min.stderr index a4ef732017d..10c2a596ca5 100644 --- a/src/test/ui/const-generics/macro_rules-braces.min.stderr +++ b/src/test/ui/const-generics/macro_rules-braces.min.stderr @@ -1,15 +1,4 @@ error: expressions must be enclosed in braces to be used as const generic arguments - --> $DIR/macro_rules-braces.rs:34:17 - | -LL | let _: baz!(N); - | ^ - | -help: enclose the `const` expression in braces - | -LL | let _: baz!({ N }); - | ^ ^ - -error: expressions must be enclosed in braces to be used as const generic arguments --> $DIR/macro_rules-braces.rs:54:17 | LL | let _: baz!(10 + 7); @@ -52,5 +41,5 @@ LL | let _: biz!({ N }); | = help: const parameters may only be used as standalone arguments, i.e. `N` -error: aborting due to 6 previous errors +error: aborting due to 5 previous errors diff --git a/src/test/ui/const-generics/macro_rules-braces.rs b/src/test/ui/const-generics/macro_rules-braces.rs index bc67d464f11..bc2eca81b61 100644 --- a/src/test/ui/const-generics/macro_rules-braces.rs +++ b/src/test/ui/const-generics/macro_rules-braces.rs @@ -31,7 +31,7 @@ fn test<const N: usize>() { let _: foo!({{ N }}); //[min]~ ERROR generic parameters may not let _: bar!(N); let _: bar!({ N }); //[min]~ ERROR generic parameters may not - let _: baz!(N); //~ ERROR expressions must be enclosed in braces + let _: baz!(N); let _: baz!({ N }); let _: baz!({{ N }}); //[min]~ ERROR generic parameters may not let _: biz!(N); |