Skip to content

Commit df3b981

Browse files
fmeasefmease
committed
Reject defaultness on free consts
1 parent 9ab0749 commit df3b981

File tree

3 files changed

+43
-13
lines changed

3 files changed

+43
-13
lines changed

‎compiler/rustc_ast_passes/src/ast_validation.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1008,12 +1008,14 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
10081008
_ => {}
10091009
}
10101010
}
1011-
ItemKind::Const(box ConstItem { defaultness, expr: None, .. }) => {
1011+
ItemKind::Const(box ConstItem { defaultness, expr, .. }) => {
10121012
self.check_defaultness(item.span, *defaultness);
1013-
self.session.emit_err(errors::ConstWithoutBody {
1014-
span: item.span,
1015-
replace_span: self.ending_semi_or_hi(item.span),
1016-
});
1013+
if expr.is_none() {
1014+
self.session.emit_err(errors::ConstWithoutBody {
1015+
span: item.span,
1016+
replace_span: self.ending_semi_or_hi(item.span),
1017+
});
1018+
}
10171019
}
10181020
ItemKind::Static(box StaticItem { expr: None, .. }) => {
10191021
self.session.emit_err(errors::StaticWithoutBody {

‎tests/ui/parser/trait-item-with-defaultness-fail-semantic.rs ‎tests/ui/parser/defaultness-invalid-places-fail-semantic.rs

+4
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,7 @@ trait X {
1010
default fn f1(); //~ ERROR `default` is only allowed on items in trait impls
1111
default fn f2() {} //~ ERROR `default` is only allowed on items in trait impls
1212
}
13+
14+
default const E: u8 = 0; //~ ERROR `default` is only allowed on items in trait impls
15+
default type F = (); //~ ERROR `default` is only allowed on items in trait impls
16+
default fn h() {} //~ ERROR `default` is only allowed on items in trait impls

‎tests/ui/parser/trait-item-with-defaultness-fail-semantic.stderr ‎tests/ui/parser/defaultness-invalid-places-fail-semantic.stderr

+32-8
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,77 @@
11
error: `default` is only allowed on items in trait impls
2-
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:6:5
2+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:6:5
33
|
44
LL | default const A: u8;
55
| -------^^^^^^^^^^^^^
66
| |
77
| `default` because of this
88

99
error: `default` is only allowed on items in trait impls
10-
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:7:5
10+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:7:5
1111
|
1212
LL | default const B: u8 = 0;
1313
| -------^^^^^^^^^^^^^^^^^
1414
| |
1515
| `default` because of this
1616

1717
error: `default` is only allowed on items in trait impls
18-
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:8:5
18+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:8:5
1919
|
2020
LL | default type D;
2121
| -------^^^^^^^^
2222
| |
2323
| `default` because of this
2424

2525
error: `default` is only allowed on items in trait impls
26-
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:9:5
26+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:9:5
2727
|
2828
LL | default type C: Ord;
2929
| -------^^^^^^^^^^^^^
3030
| |
3131
| `default` because of this
3232

3333
error: `default` is only allowed on items in trait impls
34-
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:10:5
34+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:10:5
3535
|
3636
LL | default fn f1();
3737
| -------^^^^^^^^^
3838
| |
3939
| `default` because of this
4040

4141
error: `default` is only allowed on items in trait impls
42-
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:11:5
42+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:11:5
4343
|
4444
LL | default fn f2() {}
4545
| -------^^^^^^^^
4646
| |
4747
| `default` because of this
4848

49+
error: `default` is only allowed on items in trait impls
50+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:14:1
51+
|
52+
LL | default const E: u8 = 0;
53+
| -------^^^^^^^^^^^^^^^^^
54+
| |
55+
| `default` because of this
56+
57+
error: `default` is only allowed on items in trait impls
58+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:15:1
59+
|
60+
LL | default type F = ();
61+
| -------^^^^^^^^^^^^^
62+
| |
63+
| `default` because of this
64+
65+
error: `default` is only allowed on items in trait impls
66+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:16:1
67+
|
68+
LL | default fn h() {}
69+
| -------^^^^^^^
70+
| |
71+
| `default` because of this
72+
4973
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
50-
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:1:12
74+
--> $DIR/defaultness-invalid-places-fail-semantic.rs:1:12
5175
|
5276
LL | #![feature(specialization)]
5377
| ^^^^^^^^^^^^^^
@@ -56,5 +80,5 @@ LL | #![feature(specialization)]
5680
= help: consider using `min_specialization` instead, which is more stable and complete
5781
= note: `#[warn(incomplete_features)]` on by default
5882

59-
error: aborting due to 6 previous errors; 1 warning emitted
83+
error: aborting due to 9 previous errors; 1 warning emitted
6084

0 commit comments

Comments
 (0)