Skip to content

Commit 698db85

Browse files
borsbors
committed
Auto merge of rust-lang#117171 - fee1-dead-contrib:deny-explicit-effect-params, r=oli-obk
Deny providing explicit effect params r? `@oli-obk` cc rust-lang#110395
2 parents 6f65201 + 47efc90 commit 698db85

File tree

8 files changed

+215
-5
lines changed

8 files changed

+215
-5
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
12171217
hir_id: this.lower_node_id(node_id),
12181218
body: this.lower_const_body(path_expr.span, Some(&path_expr)),
12191219
});
1220-
return GenericArg::Const(ConstArg { value: ct, span });
1220+
return GenericArg::Const(ConstArg {
1221+
value: ct,
1222+
span,
1223+
is_desugared_from_effects: false,
1224+
});
12211225
}
12221226
}
12231227
}
@@ -1228,6 +1232,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
12281232
ast::GenericArg::Const(ct) => GenericArg::Const(ConstArg {
12291233
value: self.lower_anon_const(&ct),
12301234
span: self.lower_span(ct.value.span),
1235+
is_desugared_from_effects: false,
12311236
}),
12321237
}
12331238
}
@@ -2525,6 +2530,7 @@ impl<'hir> GenericArgsCtor<'hir> {
25252530
self.args.push(hir::GenericArg::Const(hir::ConstArg {
25262531
value: hir::AnonConst { def_id, hir_id, body },
25272532
span,
2533+
is_desugared_from_effects: true,
25282534
}))
25292535
}
25302536

‎compiler/rustc_hir/src/hir.rs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@ impl<'hir> PathSegment<'hir> {
246246
pub struct ConstArg {
247247
pub value: AnonConst,
248248
pub span: Span,
249+
/// Indicates whether this comes from a `~const` desugaring.
250+
pub is_desugared_from_effects: bool,
249251
}
250252

251253
#[derive(Clone, Copy, Debug, HashStable_Generic)]
@@ -400,7 +402,14 @@ impl<'hir> GenericArgs<'hir> {
400402
/// This function returns the number of type and const generic params.
401403
/// It should only be used for diagnostics.
402404
pub fn num_generic_params(&self) -> usize {
403-
self.args.iter().filter(|arg| !matches!(arg, GenericArg::Lifetime(_))).count()
405+
self.args
406+
.iter()
407+
.filter(|arg| match arg {
408+
GenericArg::Lifetime(_)
409+
| GenericArg::Const(ConstArg { is_desugared_from_effects: true, .. }) => false,
410+
_ => true,
411+
})
412+
.count()
404413
}
405414

406415
/// The span encompassing the text inside the surrounding brackets.

‎compiler/rustc_hir_analysis/src/astconv/generics.rs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,14 @@ pub(crate) fn check_generic_arg_count(
429429
.filter(|param| matches!(param.kind, ty::GenericParamDefKind::Type { synthetic: true, .. }))
430430
.count();
431431
let named_type_param_count = param_counts.types - has_self as usize - synth_type_param_count;
432+
let synth_const_param_count = gen_params
433+
.params
434+
.iter()
435+
.filter(|param| {
436+
matches!(param.kind, ty::GenericParamDefKind::Const { is_host_effect: true, .. })
437+
})
438+
.count();
439+
let named_const_param_count = param_counts.consts - synth_const_param_count;
432440
let infer_lifetimes =
433441
(gen_pos != GenericArgPosition::Type || infer_args) && !gen_args.has_lifetime_params();
434442

@@ -573,11 +581,13 @@ pub(crate) fn check_generic_arg_count(
573581
debug!(?expected_min);
574582
debug!(arg_counts.lifetimes=?gen_args.num_lifetime_params());
575583

584+
let provided = gen_args.num_generic_params();
585+
576586
check_types_and_consts(
577587
expected_min,
578-
param_counts.consts + named_type_param_count,
579-
param_counts.consts + named_type_param_count + synth_type_param_count,
580-
gen_args.num_generic_params(),
588+
named_const_param_count + named_type_param_count,
589+
named_const_param_count + named_type_param_count + synth_type_param_count,
590+
provided,
581591
param_counts.lifetimes + has_self as usize,
582592
gen_args.num_lifetime_params(),
583593
)

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/auxiliary/cross-crate.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#![feature(const_trait_impl, effects)]
2+
3+
pub const fn foo() {}
4+
5+
#[const_trait]
6+
pub trait Bar {
7+
fn bar();
8+
}
9+
10+
impl Bar for () {
11+
fn bar() {}
12+
}

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params-cross-crate.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// aux-build: cross-crate.rs
2+
extern crate cross_crate;
3+
4+
use cross_crate::{Bar, foo};
5+
6+
fn main() {
7+
foo::<true>();
8+
//~^ ERROR: function takes 0 generic arguments but 1 generic argument was supplied
9+
<() as Bar<true>>::bar();
10+
//~^ ERROR: trait takes 0 generic arguments but 1 generic argument was supplied
11+
}
12+
13+
const FOO: () = {
14+
foo::<false>();
15+
//~^ ERROR: function takes 0 generic arguments but 1 generic argument was supplied
16+
<() as Bar<false>>::bar();
17+
//~^ ERROR: trait takes 0 generic arguments but 1 generic argument was supplied
18+
};

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params-cross-crate.stderr

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
error[E0107]: function takes 0 generic arguments but 1 generic argument was supplied
2+
--> $DIR/no-explicit-const-params-cross-crate.rs:14:5
3+
|
4+
LL | foo::<false>();
5+
| ^^^--------- help: remove these generics
6+
| |
7+
| expected 0 generic arguments
8+
|
9+
note: function defined here, with 0 generic parameters
10+
--> $DIR/auxiliary/cross-crate.rs:3:14
11+
|
12+
LL | pub const fn foo() {}
13+
| ^^^
14+
15+
error[E0107]: trait takes 0 generic arguments but 1 generic argument was supplied
16+
--> $DIR/no-explicit-const-params-cross-crate.rs:16:12
17+
|
18+
LL | <() as Bar<false>>::bar();
19+
| ^^^------- help: remove these generics
20+
| |
21+
| expected 0 generic arguments
22+
|
23+
note: trait defined here, with 0 generic parameters
24+
--> $DIR/auxiliary/cross-crate.rs:6:11
25+
|
26+
LL | pub trait Bar {
27+
| ^^^
28+
29+
error[E0107]: function takes 0 generic arguments but 1 generic argument was supplied
30+
--> $DIR/no-explicit-const-params-cross-crate.rs:7:5
31+
|
32+
LL | foo::<true>();
33+
| ^^^-------- help: remove these generics
34+
| |
35+
| expected 0 generic arguments
36+
|
37+
note: function defined here, with 0 generic parameters
38+
--> $DIR/auxiliary/cross-crate.rs:3:14
39+
|
40+
LL | pub const fn foo() {}
41+
| ^^^
42+
43+
error[E0107]: trait takes 0 generic arguments but 1 generic argument was supplied
44+
--> $DIR/no-explicit-const-params-cross-crate.rs:9:12
45+
|
46+
LL | <() as Bar<true>>::bar();
47+
| ^^^------ help: remove these generics
48+
| |
49+
| expected 0 generic arguments
50+
|
51+
note: trait defined here, with 0 generic parameters
52+
--> $DIR/auxiliary/cross-crate.rs:6:11
53+
|
54+
LL | pub trait Bar {
55+
| ^^^
56+
57+
error: aborting due to 4 previous errors
58+
59+
For more information about this error, try `rustc --explain E0107`.

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params.rs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#![feature(const_trait_impl, effects)]
2+
3+
const fn foo() {}
4+
5+
#[const_trait]
6+
trait Bar {
7+
fn bar();
8+
}
9+
10+
impl Bar for () {
11+
fn bar() {}
12+
}
13+
14+
fn main() {
15+
foo::<true>();
16+
//~^ ERROR: function takes 0 generic arguments but 1 generic argument was supplied
17+
<() as Bar<true>>::bar();
18+
//~^ ERROR: trait takes 0 generic arguments but 1 generic argument was supplied
19+
}
20+
21+
const FOO: () = {
22+
foo::<false>();
23+
//~^ ERROR: function takes 0 generic arguments but 1 generic argument was supplied
24+
<() as Bar<false>>::bar();
25+
//~^ ERROR: trait takes 0 generic arguments but 1 generic argument was supplied
26+
//~| ERROR: mismatched types
27+
};

‎tests/ui/rfcs/rfc-2632-const-trait-impl/effects/no-explicit-const-params.stderr

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
error[E0107]: function takes 0 generic arguments but 1 generic argument was supplied
2+
--> $DIR/no-explicit-const-params.rs:22:5
3+
|
4+
LL | foo::<false>();
5+
| ^^^--------- help: remove these generics
6+
| |
7+
| expected 0 generic arguments
8+
|
9+
note: function defined here, with 0 generic parameters
10+
--> $DIR/no-explicit-const-params.rs:3:10
11+
|
12+
LL | const fn foo() {}
13+
| ^^^
14+
15+
error[E0107]: trait takes 0 generic arguments but 1 generic argument was supplied
16+
--> $DIR/no-explicit-const-params.rs:24:12
17+
|
18+
LL | <() as Bar<false>>::bar();
19+
| ^^^------- help: remove these generics
20+
| |
21+
| expected 0 generic arguments
22+
|
23+
note: trait defined here, with 0 generic parameters
24+
--> $DIR/no-explicit-const-params.rs:6:7
25+
|
26+
LL | trait Bar {
27+
| ^^^
28+
29+
error[E0308]: mismatched types
30+
--> $DIR/no-explicit-const-params.rs:24:5
31+
|
32+
LL | <() as Bar<false>>::bar();
33+
| ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `false`, found `true`
34+
|
35+
= note: expected constant `false`
36+
found constant `true`
37+
38+
error[E0107]: function takes 0 generic arguments but 1 generic argument was supplied
39+
--> $DIR/no-explicit-const-params.rs:15:5
40+
|
41+
LL | foo::<true>();
42+
| ^^^-------- help: remove these generics
43+
| |
44+
| expected 0 generic arguments
45+
|
46+
note: function defined here, with 0 generic parameters
47+
--> $DIR/no-explicit-const-params.rs:3:10
48+
|
49+
LL | const fn foo() {}
50+
| ^^^
51+
52+
error[E0107]: trait takes 0 generic arguments but 1 generic argument was supplied
53+
--> $DIR/no-explicit-const-params.rs:17:12
54+
|
55+
LL | <() as Bar<true>>::bar();
56+
| ^^^------ help: remove these generics
57+
| |
58+
| expected 0 generic arguments
59+
|
60+
note: trait defined here, with 0 generic parameters
61+
--> $DIR/no-explicit-const-params.rs:6:7
62+
|
63+
LL | trait Bar {
64+
| ^^^
65+
66+
error: aborting due to 5 previous errors
67+
68+
Some errors have detailed explanations: E0107, E0308.
69+
For more information about an error, try `rustc --explain E0107`.

0 commit comments

Comments
 (0)