Skip to content

Commit e6dade9

Browse files
committed
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
2 parents 547ace8 + da28b30 commit e6dade9

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

Diff for: library/core/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@
219219
#![feature(doc_cfg)]
220220
#![feature(doc_cfg_hide)]
221221
#![feature(doc_notable_trait)]
222+
#![feature(effects)]
222223
#![feature(exhaustive_patterns)]
223224
#![feature(extern_types)]
224225
#![feature(fundamental)]

Diff for: tests/ui/consts/effect_param.rs

+4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
fn main() {
44
i8::checked_sub::<true>(42, 43);
55
//~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied
6+
i8::checked_sub::<false>(42, 43);
7+
//~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied
68
}
79

810
const FOO: () = {
911
i8::checked_sub::<false>(42, 43);
1012
//~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied
13+
i8::checked_sub::<true>(42, 43);
14+
//~^ ERROR: method takes 0 generic arguments but 1 generic argument was supplied
1115
};

Diff for: tests/ui/consts/effect_param.stderr

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied
2-
--> $DIR/effect_param.rs:9:9
2+
--> $DIR/effect_param.rs:11:9
33
|
44
LL | i8::checked_sub::<false>(42, 43);
55
| ^^^^^^^^^^^--------- help: remove these generics
66
| |
77
| expected 0 generic arguments
88

9+
error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied
10+
--> $DIR/effect_param.rs:13:9
11+
|
12+
LL | i8::checked_sub::<true>(42, 43);
13+
| ^^^^^^^^^^^-------- help: remove these generics
14+
| |
15+
| expected 0 generic arguments
16+
917
error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied
1018
--> $DIR/effect_param.rs:4:9
1119
|
@@ -14,6 +22,14 @@ LL | i8::checked_sub::<true>(42, 43);
1422
| |
1523
| expected 0 generic arguments
1624

17-
error: aborting due to 2 previous errors
25+
error[E0107]: method takes 0 generic arguments but 1 generic argument was supplied
26+
--> $DIR/effect_param.rs:6:9
27+
|
28+
LL | i8::checked_sub::<false>(42, 43);
29+
| ^^^^^^^^^^^--------- help: remove these generics
30+
| |
31+
| expected 0 generic arguments
32+
33+
error: aborting due to 4 previous errors
1834

1935
For more information about this error, try `rustc --explain E0107`.

0 commit comments

Comments
 (0)