bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/infer/cast.rs')
-rw-r--r--crates/hir-ty/src/infer/cast.rs34
1 files changed, 21 insertions, 13 deletions
diff --git a/crates/hir-ty/src/infer/cast.rs b/crates/hir-ty/src/infer/cast.rs
index caa3960a22..21d0be6ed5 100644
--- a/crates/hir-ty/src/infer/cast.rs
+++ b/crates/hir-ty/src/infer/cast.rs
@@ -5,8 +5,9 @@ use hir_def::{hir::ExprId, AdtId};
use stdx::never;
use crate::{
- infer::unify::InferenceTable, Adjustment, Binders, DynTy, InferenceDiagnostic, Interner,
- PlaceholderIndex, QuantifiedWhereClauses, Ty, TyExt, TyKind, TypeFlags, WhereClause,
+ infer::{coerce::CoerceNever, unify::InferenceTable},
+ Adjustment, Binders, DynTy, InferenceDiagnostic, Interner, PlaceholderIndex,
+ QuantifiedWhereClauses, Ty, TyExt, TyKind, TypeFlags, WhereClause,
};
#[derive(Debug)]
@@ -70,8 +71,9 @@ pub enum CastError {
NeedViaThinPtr,
NeedViaInt,
NonScalar,
- UnknownCastPtrKind,
- UnknownExprPtrKind,
+ // We don't want to report errors with unknown types currently.
+ // UnknownCastPtrKind,
+ // UnknownExprPtrKind,
}
impl CastError {
@@ -127,7 +129,7 @@ impl CastCheck {
return Ok(());
}
- if let Ok((adj, _)) = table.coerce(&self.expr_ty, &self.cast_ty) {
+ if let Ok((adj, _)) = table.coerce(&self.expr_ty, &self.cast_ty, CoerceNever::Yes) {
apply_adjustments(self.source_expr, adj);
set_coercion_cast(self.source_expr);
return Ok(());
@@ -153,7 +155,8 @@ impl CastCheck {
let sig = self.expr_ty.callable_sig(table.db).expect("FnDef had no sig");
let sig = table.normalize_associated_types_in(sig);
let fn_ptr = TyKind::Function(sig.to_fn_ptr()).intern(Interner);
- if let Ok((adj, _)) = table.coerce(&self.expr_ty, &fn_ptr) {
+ if let Ok((adj, _)) = table.coerce(&self.expr_ty, &fn_ptr, CoerceNever::Yes)
+ {
apply_adjustments(self.source_expr, adj);
} else {
return Err(CastError::IllegalCast);
@@ -240,7 +243,8 @@ impl CastCheck {
if let TyKind::Array(ety, _) = t_expr.kind(Interner) {
// Coerce to a raw pointer so that we generate RawPtr in MIR.
let array_ptr_type = TyKind::Raw(m_expr, t_expr.clone()).intern(Interner);
- if let Ok((adj, _)) = table.coerce(&self.expr_ty, &array_ptr_type) {
+ if let Ok((adj, _)) = table.coerce(&self.expr_ty, &array_ptr_type, CoerceNever::Yes)
+ {
apply_adjustments(self.source_expr, adj);
} else {
never!(
@@ -252,7 +256,7 @@ impl CastCheck {
// This is a less strict condition than rustc's `demand_eqtype`,
// but false negative is better than false positive
- if table.coerce(ety, t_cast).is_ok() {
+ if table.coerce(ety, t_cast, CoerceNever::Yes).is_ok() {
return Ok(());
}
}
@@ -272,9 +276,10 @@ impl CastCheck {
match (src_kind, dst_kind) {
(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(()),
- (None, _) => Err(CastError::UnknownExprPtrKind),
(Some(PointerKind::Thin), _) => Err(CastError::SizedUnsizedCast),
(Some(PointerKind::VTable(src_tty)), Some(PointerKind::VTable(dst_tty))) => {
let principal = |tty: &Binders<QuantifiedWhereClauses>| {
@@ -315,7 +320,8 @@ impl CastCheck {
expr_ty: &Ty,
) -> Result<(), CastError> {
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::Thin) => Ok(()),
_ => Err(CastError::NeedViaThinPtr),
@@ -328,7 +334,8 @@ impl CastCheck {
cast_ty: &Ty,
) -> Result<(), CastError> {
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::Thin) => Ok(()),
Some(PointerKind::VTable(_)) => Err(CastError::IntToFatCast),
@@ -343,7 +350,8 @@ impl CastCheck {
cast_ty: &Ty,
) -> Result<(), CastError> {
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::Thin) => Ok(()),
_ => Err(CastError::IllegalCast),