Auto merge of rust-lang#117825 - fee1-dead-contrib:corefx, r=petroche…

…nkov Reenable effects in libcore With rust-lang#116670, rust-lang#117531, and rust-lang#117171, I think we would be comfortable with re-enabling the effects feature for more testing in libcore. r? `@oli-obk` cc `@fmease` cc rust-lang#110395
rust-lang-ci · Nov 18, 2023 · e6dade9 · e6dade9
2 parents 547ace8 + da28b30
commit e6dade9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,11 +1,19 @@
 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
    |         |
    |         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
    |
@@ -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`.