Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Properly reject default on free const items #117818

Merged
merged 1 commit into from
Dec 18, 2023
Merged

Properly reject default on free const items #117818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions compiler/rustc_ast_passes/src/ast_validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,12 +1008,14 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
_ => {}
}
}
ItemKind::Const(box ConstItem { defaultness, expr: None, .. }) => {
ItemKind::Const(box ConstItem { defaultness, expr, .. }) => {
self.check_defaultness(item.span, *defaultness);
self.session.emit_err(errors::ConstWithoutBody {
span: item.span,
replace_span: self.ending_semi_or_hi(item.span),
});
if expr.is_none() {
self.session.emit_err(errors::ConstWithoutBody {
span: item.span,
replace_span: self.ending_semi_or_hi(item.span),
});
}
}
ItemKind::Static(box StaticItem { expr: None, .. }) => {
self.session.emit_err(errors::StaticWithoutBody {
Expand Down
4 changes: 4 additions & 0 deletions ...it-item-with-defaultness-fail-semantic.rs → ...faultness-invalid-places-fail-semantic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ trait X {
default fn f1(); //~ ERROR `default` is only allowed on items in trait impls
default fn f2() {} //~ ERROR `default` is only allowed on items in trait impls
}

default const E: u8 = 0; //~ ERROR `default` is only allowed on items in trait impls
default type F = (); //~ ERROR `default` is only allowed on items in trait impls
default fn h() {} //~ ERROR `default` is only allowed on items in trait impls
40 changes: 32 additions & 8 deletions ...tem-with-defaultness-fail-semantic.stderr → ...tness-invalid-places-fail-semantic.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,77 @@
error: `default` is only allowed on items in trait impls
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:6:5
--> $DIR/defaultness-invalid-places-fail-semantic.rs:6:5
|
LL | default const A: u8;
| -------^^^^^^^^^^^^^
| |
| `default` because of this

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

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

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

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

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

error: `default` is only allowed on items in trait impls
--> $DIR/defaultness-invalid-places-fail-semantic.rs:14:1
|
LL | default const E: u8 = 0;
| -------^^^^^^^^^^^^^^^^^
| |
| `default` because of this

error: `default` is only allowed on items in trait impls
--> $DIR/defaultness-invalid-places-fail-semantic.rs:15:1
|
LL | default type F = ();
| -------^^^^^^^^^^^^^
| |
| `default` because of this

error: `default` is only allowed on items in trait impls
--> $DIR/defaultness-invalid-places-fail-semantic.rs:16:1
|
LL | default fn h() {}
| -------^^^^^^^
| |
| `default` because of this

warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
--> $DIR/trait-item-with-defaultness-fail-semantic.rs:1:12
--> $DIR/defaultness-invalid-places-fail-semantic.rs:1:12
|
LL | #![feature(specialization)]
| ^^^^^^^^^^^^^^
Expand All @@ -56,5 +80,5 @@ LL | #![feature(specialization)]
= help: consider using `min_specialization` instead, which is more stable and complete
= note: `#[warn(incomplete_features)]` on by default

error: aborting due to 6 previous errors; 1 warning emitted
error: aborting due to 9 previous errors; 1 warning emitted

Loading