Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Comment out cast checks for unknown ptr kind

Browse source 
Just like we don't check for types containing unknown.
This commit is contained in:
Chayim Refael Friedman 2024-09-30 19:26:16 +03:00
parent 546339a7be
commit ff3c95f414
2 changed files with 48 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/hir-ty/src/infer/cast.rs
View file

@ -70,8 +70,9 @@ pub enum CastError {
NeedViaThinPtr, NeedViaThinPtr,
NeedViaInt, NeedViaInt,
NonScalar, NonScalar,
UnknownCastPtrKind, // We don't want to report errors with unknown types currently.
UnknownExprPtrKind, // UnknownCastPtrKind,
// UnknownExprPtrKind,
} }
impl CastError { impl CastError {
@ -272,9 +273,10 @@ impl CastCheck {
match (src_kind, dst_kind) { match (src_kind, dst_kind) {
(Some(PointerKind::Error), _) | (_, Some(PointerKind::Error)) => Ok(()), (Some(PointerKind::Error), _) | (_, Some(PointerKind::Error)) => Ok(()),
(_, None) => Err(CastError::UnknownCastPtrKind), // (_, None) => Err(CastError::UnknownCastPtrKind),
// (None, _) => Err(CastError::UnknownExprPtrKind),
(_, None) | (None, _) => Ok(()),
(_, Some(PointerKind::Thin)) => Ok(()), (_, Some(PointerKind::Thin)) => Ok(()),
(None, _) => Err(CastError::UnknownExprPtrKind),
(Some(PointerKind::Thin), _) => Err(CastError::SizedUnsizedCast), (Some(PointerKind::Thin), _) => Err(CastError::SizedUnsizedCast),
(Some(PointerKind::VTable(src_tty)), Some(PointerKind::VTable(dst_tty))) => { (Some(PointerKind::VTable(src_tty)), Some(PointerKind::VTable(dst_tty))) => {
let principal = |tty: &Binders<QuantifiedWhereClauses>| { let principal = |tty: &Binders<QuantifiedWhereClauses>| {
@ -315,7 +317,8 @@ impl CastCheck {
expr_ty: &Ty, expr_ty: &Ty,
) -> Result<(), CastError> { ) -> Result<(), CastError> {
match pointer_kind(expr_ty, table).map_err(|_| CastError::Unknown)? { match pointer_kind(expr_ty, table).map_err(|_| CastError::Unknown)? {
None => Err(CastError::UnknownExprPtrKind), // None => Err(CastError::UnknownExprPtrKind),
None => Ok(()),
Some(PointerKind::Error) => Ok(()), Some(PointerKind::Error) => Ok(()),
Some(PointerKind::Thin) => Ok(()), Some(PointerKind::Thin) => Ok(()),
_ => Err(CastError::NeedViaThinPtr), _ => Err(CastError::NeedViaThinPtr),
@ -328,7 +331,8 @@ impl CastCheck {
cast_ty: &Ty, cast_ty: &Ty,
) -> Result<(), CastError> { ) -> Result<(), CastError> {
match pointer_kind(cast_ty, table).map_err(|_| CastError::Unknown)? { match pointer_kind(cast_ty, table).map_err(|_| CastError::Unknown)? {
None => Err(CastError::UnknownCastPtrKind), // None => Err(CastError::UnknownCastPtrKind),
None => Ok(()),
Some(PointerKind::Error) => Ok(()), Some(PointerKind::Error) => Ok(()),
Some(PointerKind::Thin) => Ok(()), Some(PointerKind::Thin) => Ok(()),
Some(PointerKind::VTable(_)) => Err(CastError::IntToFatCast), Some(PointerKind::VTable(_)) => Err(CastError::IntToFatCast),
@ -343,7 +347,8 @@ impl CastCheck {
cast_ty: &Ty, cast_ty: &Ty,
) -> Result<(), CastError> { ) -> Result<(), CastError> {
match pointer_kind(cast_ty, table).map_err(|_| CastError::Unknown)? { match pointer_kind(cast_ty, table).map_err(|_| CastError::Unknown)? {
None => Err(CastError::UnknownCastPtrKind), // None => Err(CastError::UnknownCastPtrKind),
None => Ok(()),
Some(PointerKind::Error) => Ok(()), Some(PointerKind::Error) => Ok(()),
Some(PointerKind::Thin) => Ok(()), Some(PointerKind::Thin) => Ok(()),
_ => Err(CastError::IllegalCast), _ => Err(CastError::IllegalCast),

54
crates/ide-diagnostics/src/handlers/invalid_cast.rs
View file

@ -95,10 +95,10 @@ pub(crate) fn invalid_cast(ctx: &DiagnosticsContext<'_>, d: &hir::InvalidCast) -
DiagnosticCode::RustcHardError("E0605"), DiagnosticCode::RustcHardError("E0605"),
format_ty!(ctx, "non-primitive cast: `{}` as `{}`", d.expr_ty, d.cast_ty), format_ty!(ctx, "non-primitive cast: `{}` as `{}`", d.expr_ty, d.cast_ty),
), ),
CastError::UnknownCastPtrKind | CastError::UnknownExprPtrKind => ( // CastError::UnknownCastPtrKind | CastError::UnknownExprPtrKind => (
DiagnosticCode::RustcHardError("E0641"), // DiagnosticCode::RustcHardError("E0641"),
"cannot cast to a pointer of an unknown kind".to_owned(), // "cannot cast to a pointer of an unknown kind".to_owned(),
), // ),
}; };
Diagnostic::new(code, message, display_range) Diagnostic::new(code, message, display_range)
} }
@ -457,20 +457,20 @@ fn foo<T: ?Sized>() {
); );
} }
#[test] // #[test]
fn order_dependent_cast_inference() { // fn order_dependent_cast_inference() {
check_diagnostics( // check_diagnostics(
r#" // r#"
//- minicore: sized // //- minicore: sized
fn main() { // fn main() {
let x = &"hello"; // let x = &"hello";
let mut y = 0 as *const _; // let mut y = 0 as *const _;
//^^^^^^^^^^^^^ error: cannot cast to a pointer of an unknown kind // //^^^^^^^^^^^^^ error: cannot cast to a pointer of an unknown kind
y = x as *const _; // y = x as *const _;
} // }
"#, // "#,
); // );
} // }
#[test] #[test]
fn ptr_to_ptr_different_regions() { fn ptr_to_ptr_different_regions() {
@ -1111,4 +1111,22 @@ fn foo() {
"#, "#,
); );
} }
#[test]
fn cast_isize_to_infer_pointer() {
check_diagnostics(
r#"
//- minicore: coerce_unsized
struct Foo {}
struct Wrap<'a>(&'a mut Foo);
fn main() {
let lparam: isize = 0;
let _wrap = Wrap(unsafe { &mut *(lparam as *mut _) });
}
"#,
);
}
} }