Tweak error code for sized checks of const/static
This commit is contained in:
Michael Goulet
parent
e16a049adb
commit
c566318a78
12 changed files with 26 additions and 7 deletions
|
|
@ -1108,7 +1108,13 @@ fn check_associated_item(
|
|||
let ty = tcx.type_of(item.def_id).instantiate_identity();
|
||||
let ty = wfcx.normalize(span, Some(WellFormedLoc::Ty(item_id)), ty);
|
||||
wfcx.register_wf_obligation(span, loc, ty.into());
|
||||
check_sized_if_body(wfcx, item.def_id.expect_local(), ty, Some(span));
|
||||
check_sized_if_body(
|
||||
wfcx,
|
||||
item.def_id.expect_local(),
|
||||
ty,
|
||||
Some(span),
|
||||
ObligationCauseCode::SizedConstOrStatic,
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
ty::AssocKind::Fn => {
|
||||
|
|
@ -1354,7 +1360,7 @@ fn check_item_type(
|
|||
traits::ObligationCause::new(
|
||||
ty_span,
|
||||
wfcx.body_def_id,
|
||||
ObligationCauseCode::WellFormed(None),
|
||||
ObligationCauseCode::SizedConstOrStatic,
|
||||
),
|
||||
wfcx.param_env,
|
||||
item_ty,
|
||||
|
|
@ -1698,6 +1704,7 @@ fn check_fn_or_method<'tcx>(
|
|||
hir::FnRetTy::Return(ty) => Some(ty.span),
|
||||
hir::FnRetTy::DefaultReturn(_) => None,
|
||||
},
|
||||
ObligationCauseCode::SizedReturnType,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -1706,13 +1713,14 @@ fn check_sized_if_body<'tcx>(
|
|||
def_id: LocalDefId,
|
||||
ty: Ty<'tcx>,
|
||||
maybe_span: Option<Span>,
|
||||
code: ObligationCauseCode<'tcx>,
|
||||
) {
|
||||
let tcx = wfcx.tcx();
|
||||
if let Some(body) = tcx.hir_maybe_body_owned_by(def_id) {
|
||||
let span = maybe_span.unwrap_or(body.value.span);
|
||||
|
||||
wfcx.register_bound(
|
||||
ObligationCause::new(span, def_id, traits::ObligationCauseCode::SizedReturnType),
|
||||
ObligationCause::new(span, def_id, code),
|
||||
wfcx.param_env,
|
||||
ty,
|
||||
tcx.require_lang_item(LangItem::Sized, Some(span)),
|
||||
|
|
|
|||
|
|
@ -1806,7 +1806,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||
crate::GatherLocalsVisitor::new(&fcx).visit_body(body);
|
||||
|
||||
let ty = fcx.check_expr_with_expectation(body.value, expected);
|
||||
fcx.require_type_is_sized(ty, body.value.span, ObligationCauseCode::ConstSized);
|
||||
fcx.require_type_is_sized(ty, body.value.span, ObligationCauseCode::SizedConstOrStatic);
|
||||
fcx.write_ty(block.hir_id, ty);
|
||||
ty
|
||||
}
|
||||
|
|
|
|||
|
|
@ -266,7 +266,7 @@ pub enum ObligationCauseCode<'tcx> {
|
|||
},
|
||||
|
||||
/// Constant expressions must be sized.
|
||||
ConstSized,
|
||||
SizedConstOrStatic,
|
||||
|
||||
/// `static` items must have `Sync` type.
|
||||
SharedStatic,
|
||||
|
|
|
|||
|
|
@ -3126,8 +3126,8 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
|
|||
Applicability::MachineApplicable,
|
||||
);
|
||||
}
|
||||
ObligationCauseCode::ConstSized => {
|
||||
err.note("constant expressions must have a statically known size");
|
||||
ObligationCauseCode::SizedConstOrStatic => {
|
||||
err.note("statics and constants must have a statically known size");
|
||||
}
|
||||
ObligationCauseCode::InlineAsmSized => {
|
||||
err.note("all inline asm arguments must have a statically known size");
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ LL | const ONE: [u16] = [1];
|
|||
| ^^^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `[u16]`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/const-slice-array-deref.rs:1:20
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ LL | const CONST_0: dyn Debug + Sync = *(&0 as &(dyn Debug + Sync));
|
|||
| ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `(dyn Debug + Sync + 'static)`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0277]: the size for values of type `str` cannot be known at compilation time
|
||||
--> $DIR/const-unsized.rs:7:18
|
||||
|
|
@ -13,6 +14,7 @@ LL | const CONST_FOO: str = *"foo";
|
|||
| ^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `str`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0277]: the size for values of type `(dyn Debug + Sync + 'static)` cannot be known at compilation time
|
||||
--> $DIR/const-unsized.rs:11:18
|
||||
|
|
@ -21,6 +23,7 @@ LL | static STATIC_1: dyn Debug + Sync = *(&1 as &(dyn Debug + Sync));
|
|||
| ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `(dyn Debug + Sync + 'static)`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0277]: the size for values of type `str` cannot be known at compilation time
|
||||
--> $DIR/const-unsized.rs:15:20
|
||||
|
|
@ -29,6 +32,7 @@ LL | static STATIC_BAR: str = *"bar";
|
|||
| ^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `str`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0507]: cannot move out of a shared reference
|
||||
--> $DIR/const-unsized.rs:3:35
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ LL | static FOO: Sync = AtomicUsize::new(0);
|
|||
| ^^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `(dyn Sync + 'static)`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error: aborting due to 2 previous errors; 1 warning emitted
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ LL | static symbol: [usize];
|
|||
| ^^^^^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `[usize]`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0133]: use of extern static is unsafe and requires unsafe function or block
|
||||
--> $DIR/issue-36122-accessing-externed-dst.rs:5:20
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ LL | pub static mut symbol: [i8];
|
|||
| ^^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `[i8]`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ LL | static foo: dyn Fn() -> u32 = || -> u32 {
|
|||
| ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `(dyn Fn() -> u32 + 'static)`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/issue-24446.rs:2:35
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ note: required because it appears within the type `Foo`
|
|||
|
|
||||
LL | pub struct Foo {
|
||||
| ^^^
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/unsized_type2.rs:14:45
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ LL | const TEST: Fn = some_fn;
|
|||
| ^^ doesn't have a size known at compile-time
|
||||
|
|
||||
= help: the trait `Sized` is not implemented for `(dyn FnOnce() -> u8 + 'static)`
|
||||
= note: statics and constants must have a statically known size
|
||||
|
||||
error[E0277]: the size for values of type `(dyn FnOnce() -> u8 + 'static)` cannot be known at compilation time
|
||||
--> $DIR/ice-unsized-tuple-const-issue-121443.rs:11:14
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue