mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-05 03:38:29 +00:00
Fix sized constraint for unsafe binder
This commit is contained in:
parent
f45d4acf1b
commit
b67b6c0503
@ -37,8 +37,6 @@ fn sized_constraint_for_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'
|
|||||||
| Never
|
| Never
|
||||||
| Dynamic(_, _, ty::DynStar) => None,
|
| Dynamic(_, _, ty::DynStar) => None,
|
||||||
|
|
||||||
UnsafeBinder(_) => todo!(),
|
|
||||||
|
|
||||||
// these are never sized
|
// these are never sized
|
||||||
Str | Slice(..) | Dynamic(_, _, ty::Dyn) | Foreign(..) => Some(ty),
|
Str | Slice(..) | Dynamic(_, _, ty::Dyn) | Foreign(..) => Some(ty),
|
||||||
|
|
||||||
@ -52,9 +50,14 @@ fn sized_constraint_for_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'
|
|||||||
sized_constraint_for_ty(tcx, ty)
|
sized_constraint_for_ty(tcx, ty)
|
||||||
}),
|
}),
|
||||||
|
|
||||||
// these can be sized or unsized
|
// these can be sized or unsized.
|
||||||
Param(..) | Alias(..) | Error(_) => Some(ty),
|
Param(..) | Alias(..) | Error(_) => Some(ty),
|
||||||
|
|
||||||
|
// We cannot instantiate the binder, so just return the *original* type back,
|
||||||
|
// but only if the inner type has a sized constraint. Thus we skip the binder,
|
||||||
|
// but don't actually use the result from `sized_constraint_for_ty`.
|
||||||
|
UnsafeBinder(inner_ty) => sized_constraint_for_ty(tcx, inner_ty.skip_binder()).map(|_| ty),
|
||||||
|
|
||||||
Placeholder(..) | Bound(..) | Infer(..) => {
|
Placeholder(..) | Bound(..) | Infer(..) => {
|
||||||
bug!("unexpected type `{ty:?}` in sized_constraint_for_ty")
|
bug!("unexpected type `{ty:?}` in sized_constraint_for_ty")
|
||||||
}
|
}
|
||||||
|
18
tests/ui/unsafe-binders/binder-sized-crit.rs
Normal file
18
tests/ui/unsafe-binders/binder-sized-crit.rs
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
//@ check-pass
|
||||||
|
|
||||||
|
#![feature(unsafe_binders)]
|
||||||
|
//~^ WARN the feature `unsafe_binders` is incomplete
|
||||||
|
|
||||||
|
use std::unsafe_binder::wrap_binder;
|
||||||
|
|
||||||
|
struct A {
|
||||||
|
b: unsafe<> (),
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
unsafe {
|
||||||
|
let _ = A {
|
||||||
|
b: wrap_binder!(()),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
11
tests/ui/unsafe-binders/binder-sized-crit.stderr
Normal file
11
tests/ui/unsafe-binders/binder-sized-crit.stderr
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
warning: the feature `unsafe_binders` is incomplete and may not be safe to use and/or cause compiler crashes
|
||||||
|
--> $DIR/binder-sized-crit.rs:3:12
|
||||||
|
|
|
||||||
|
LL | #![feature(unsafe_binders)]
|
||||||
|
| ^^^^^^^^^^^^^^
|
||||||
|
|
|
||||||
|
= note: see issue #130516 <https://github.com/rust-lang/rust/issues/130516> for more information
|
||||||
|
= note: `#[warn(incomplete_features)]` on by default
|
||||||
|
|
||||||
|
warning: 1 warning emitted
|
||||||
|
|
Loading…
Reference in New Issue
Block a user