diff options
| author | bors <bors@rust-lang.org> | 2023-11-18 04:56:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-18 04:56:31 +0000 |
| commit | e6dade96f4f16b2c0f621d657130b90b4bb519a2 (patch) | |
| tree | 9d8f9a6d0ea532584e10775201be1204a8dff8eb | |
| parent | 547ace805166137052b2b76ee6770ef7cc8aa7c1 (diff) | |
| parent | da28b308968cebefe7275a14bc485f9ef62a966e (diff) | |
| download | rust-e6dade96f4f16b2c0f621d657130b90b4bb519a2.tar.gz rust-e6dade96f4f16b2c0f621d657130b90b4bb519a2.zip | |
Auto merge of #117825 - fee1-dead-contrib:corefx, r=petrochenkov
Reenable effects in libcore With #116670, #117531, and #117171, I think we would be comfortable with re-enabling the effects feature for more testing in libcore. r? `@oli-obk` cc `@fmease` cc #110395
| -rw-r--r-- | library/core/src/lib.rs | 1 | ||||
| -rw-r--r-- | tests/ui/consts/effect_param.rs | 4 | ||||
| -rw-r--r-- | tests/ui/consts/effect_param.stderr | 20 |
3 files changed, 23 insertions, 2 deletions
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 4c6d5df389c..8a7eb201254 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -219,6 +219,7 @@ #![feature(doc_cfg)] #![feature(doc_cfg_hide)] #![feature(doc_notable_trait)] +#![feature(effects)] #![feature(exhaustive_patterns)] #![feature(extern_types)] #![feature(fundamental)] diff --git a/tests/ui/consts/effect_param.rs b/tests/ui/consts/effect_param.rs index f11ec739fce..bfe0a519037 100644 --- a/tests/ui/consts/effect_param.rs +++ b/tests/ui/consts/effect_param.rs @@ -3,9 +3,13 @@ fn main() { i8::checked_sub::<true>(42, 43); //~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied + i8::checked_sub::<false>(42, 43); + //~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied } const FOO: () = { i8::checked_sub::<false>(42, 43); //~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied + i8::checked_sub::<true>(42, 43); + //~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied }; diff --git a/tests/ui/consts/effect_param.stderr b/tests/ui/consts/effect_param.stderr index f8c4bfc02e5..dba5d49b792 100644 --- a/tests/ui/consts/effect_param.stderr +++ b/tests/ui/consts/effect_param.stderr @@ -1,5 +1,5 @@ error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied - --> $DIR/effect_param.rs:9:9 + --> $DIR/effect_param.rs:11:9 | LL | i8::checked_sub::<false>(42, 43); | ^^^^^^^^^^^--------- help: remove these generics @@ -7,6 +7,14 @@ LL | i8::checked_sub::<false>(42, 43); | expected 0 generic arguments error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied + --> $DIR/effect_param.rs:13:9 + | +LL | i8::checked_sub::<true>(42, 43); + | ^^^^^^^^^^^-------- help: remove these generics + | | + | expected 0 generic arguments + +error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied --> $DIR/effect_param.rs:4:9 | LL | i8::checked_sub::<true>(42, 43); @@ -14,6 +22,14 @@ LL | i8::checked_sub::<true>(42, 43); | | | expected 0 generic arguments -error: aborting due to 2 previous errors +error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied + --> $DIR/effect_param.rs:6:9 + | +LL | i8::checked_sub::<false>(42, 43); + | ^^^^^^^^^^^--------- help: remove these generics + | | + | expected 0 generic arguments + +error: aborting due to 4 previous errors For more information about this error, try `rustc --explain E0107`. |