diff options
| author | Noah Lev <camelidcamel@gmail.com> | 2024-09-08 01:49:25 -0400 |
|---|---|---|
| committer | Noah Lev <camelidcamel@gmail.com> | 2024-09-12 13:56:01 -0400 |
| commit | e0bd01167e86d07c03e8ddd2bb0a25f689a2a7f5 (patch) | |
| tree | 199eece79e78d0a347adfdad064c8791f8e562ef /tests/ui/coherence | |
| parent | 8b75004bcad5f25ef31894986945ff75b53d7d94 (diff) | |
| download | rust-e0bd01167e86d07c03e8ddd2bb0a25f689a2a7f5.tar.gz rust-e0bd01167e86d07c03e8ddd2bb0a25f689a2a7f5.zip | |
Re-enable `ConstArgKind::Path` lowering by default
...and remove the `const_arg_path` feature gate as a result. It was only a stopgap measure to fix the regression that the new lowering introduced (which should now be fixed by this PR).
Diffstat (limited to 'tests/ui/coherence')
| -rw-r--r-- | tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs | 2 | ||||
| -rw-r--r-- | tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr | 20 |
2 files changed, 3 insertions, 19 deletions
diff --git a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs index cdfeb9c434e..e07fa78463c 100644 --- a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs +++ b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.rs @@ -5,9 +5,7 @@ #![feature(with_negative_coherence)] trait Trait {} impl<const N: u8> Trait for [(); N] {} -//~^ ERROR: mismatched types impl<const N: i8> Trait for [(); N] {} //~^ ERROR: conflicting implementations of trait `Trait` -//~| ERROR: mismatched types fn main() {} diff --git a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr index d65450845bc..2087be8e711 100644 --- a/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr +++ b/tests/ui/coherence/negative-coherence/generic_const_type_mismatch.stderr @@ -1,25 +1,11 @@ error[E0119]: conflicting implementations of trait `Trait` for type `[(); _]` - --> $DIR/generic_const_type_mismatch.rs:9:1 + --> $DIR/generic_const_type_mismatch.rs:8:1 | LL | impl<const N: u8> Trait for [(); N] {} | ----------------------------------- first implementation here -LL | LL | impl<const N: i8> Trait for [(); N] {} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `[(); _]` -error[E0308]: mismatched types - --> $DIR/generic_const_type_mismatch.rs:7:34 - | -LL | impl<const N: u8> Trait for [(); N] {} - | ^ expected `usize`, found `u8` - -error[E0308]: mismatched types - --> $DIR/generic_const_type_mismatch.rs:9:34 - | -LL | impl<const N: i8> Trait for [(); N] {} - | ^ expected `usize`, found `i8` - -error: aborting due to 3 previous errors +error: aborting due to 1 previous error -Some errors have detailed explanations: E0119, E0308. -For more information about an error, try `rustc --explain E0119`. +For more information about this error, try `rustc --explain E0119`. |