diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs
index 5a1691effe5..351ba75ffdd 100644
--- a/crates/hir/src/code_model.rs
+++ b/crates/hir/src/code_model.rs
@@ -33,7 +33,7 @@ use hir_ty::{
traits::{FnTrait, Solution, SolutionVariables},
BoundVar, CallableDefId, CallableSig, Canonical, DebruijnIndex, GenericPredicate,
InEnvironment, Obligation, ProjectionPredicate, ProjectionTy, Scalar, Substs, TraitEnvironment,
- Ty, TyDefId, TyKind,
+ Ty, TyDefId, TyVariableKind,
};
use rustc_hash::FxHashSet;
use stdx::{format_to, impl_from};
@@ -1655,7 +1655,7 @@ impl Type {
self.ty.environment.clone(),
Obligation::Projection(predicate),
),
- kinds: Arc::new([TyKind::General]),
+ kinds: Arc::new([TyVariableKind::General]),
};
match db.trait_solve(self.krate, goal)? {
diff --git a/crates/hir_ty/src/autoderef.rs b/crates/hir_ty/src/autoderef.rs
index ece68183e74..21d1e5446dd 100644
--- a/crates/hir_ty/src/autoderef.rs
+++ b/crates/hir_ty/src/autoderef.rs
@@ -89,8 +89,10 @@ fn deref_by_trait(
let in_env = InEnvironment { value: obligation, environment: ty.environment };
- let canonical =
- Canonical::new(in_env, ty.value.kinds.iter().copied().chain(Some(super::TyKind::General)));
+ let canonical = Canonical::new(
+ in_env,
+ ty.value.kinds.iter().copied().chain(Some(chalk_ir::TyVariableKind::General)),
+ );
let solution = db.trait_solve(krate, canonical)?;
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index 179f7ff442a..ff821109417 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -565,7 +565,7 @@ impl HirDisplay for Ty {
}
write!(f, "{{unknown}}")?;
}
- Ty::Infer(..) => write!(f, "_")?,
+ Ty::InferenceVar(..) => write!(f, "_")?,
}
Ok(())
}
diff --git a/crates/hir_ty/src/infer.rs b/crates/hir_ty/src/infer.rs
index a1769729ffc..1d78d1feb87 100644
--- a/crates/hir_ty/src/infer.rs
+++ b/crates/hir_ty/src/infer.rs
@@ -36,12 +36,11 @@ use stdx::impl_from;
use syntax::SmolStr;
use super::{
- primitive::{FloatTy, IntTy},
traits::{Guidance, Obligation, ProjectionPredicate, Solution},
InEnvironment, ProjectionTy, Substs, TraitEnvironment, TraitRef, Ty, TypeWalk,
};
use crate::{
- db::HirDatabase, infer::diagnostics::InferenceDiagnostic, lower::ImplTraitLoweringMode, Scalar,
+ db::HirDatabase, infer::diagnostics::InferenceDiagnostic, lower::ImplTraitLoweringMode,
};
pub(crate) use unify::unify;
@@ -655,30 +654,17 @@ impl<'a> InferenceContext<'a> {
/// two are used for inference of literal values (e.g. `100` could be one of
/// several integer types).
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
-pub enum InferTy {
- TypeVar(unify::TypeVarId),
- IntVar(unify::TypeVarId),
- FloatVar(unify::TypeVarId),
- MaybeNeverTypeVar(unify::TypeVarId),
+pub struct InferenceVar {
+ index: u32,
}
-impl InferTy {
+impl InferenceVar {
fn to_inner(self) -> unify::TypeVarId {
- match self {
- InferTy::TypeVar(ty)
- | InferTy::IntVar(ty)
- | InferTy::FloatVar(ty)
- | InferTy::MaybeNeverTypeVar(ty) => ty,
- }
+ unify::TypeVarId(self.index)
}
- fn fallback_value(self) -> Ty {
- match self {
- InferTy::TypeVar(..) => Ty::Unknown,
- InferTy::IntVar(..) => Ty::Scalar(Scalar::Int(IntTy::I32)),
- InferTy::FloatVar(..) => Ty::Scalar(Scalar::Float(FloatTy::F64)),
- InferTy::MaybeNeverTypeVar(..) => Ty::Never,
- }
+ fn from_inner(unify::TypeVarId(index): unify::TypeVarId) -> Self {
+ InferenceVar { index }
}
}
diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs
index 4cca3590481..667b26a7646 100644
--- a/crates/hir_ty/src/infer/coerce.rs
+++ b/crates/hir_ty/src/infer/coerce.rs
@@ -4,12 +4,13 @@
//!
//! See: https://doc.rust-lang.org/nomicon/coercions.html
+use chalk_ir::TyVariableKind;
use hir_def::{lang_item::LangItemTarget, type_ref::Mutability};
use test_utils::mark;
use crate::{autoderef, traits::Solution, Obligation, Substs, TraitRef, Ty};
-use super::{unify::TypeVarValue, InEnvironment, InferTy, InferenceContext};
+use super::{InEnvironment, InferenceContext};
impl<'a> InferenceContext<'a> {
/// Unify two types, but may coerce the first one to the second one
@@ -53,9 +54,8 @@ impl<'a> InferenceContext<'a> {
fn coerce_inner(&mut self, mut from_ty: Ty, to_ty: &Ty) -> bool {
match (&from_ty, to_ty) {
// Never type will make type variable to fallback to Never Type instead of Unknown.
- (Ty::Never, Ty::Infer(InferTy::TypeVar(tv))) => {
- let var = self.table.new_maybe_never_type_var();
- self.table.var_unification_table.union_value(*tv, TypeVarValue::Known(var));
+ (Ty::Never, Ty::InferenceVar(tv, TyVariableKind::General)) => {
+ self.table.type_variable_table.set_diverging(*tv, true);
return true;
}
(Ty::Never, _) => return true,
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs
index 23d4ac8ef81..928ad37a3de 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir_ty/src/infer/expr.rs
@@ -3,6 +3,7 @@
use std::iter::{repeat, repeat_with};
use std::{mem, sync::Arc};
+use chalk_ir::TyVariableKind;
use hir_def::{
expr::{Array, BinaryOp, Expr, ExprId, Literal, Statement, UnaryOp},
path::{GenericArg, GenericArgs},
@@ -18,8 +19,8 @@ use crate::{
primitive::{self, UintTy},
traits::{FnTrait, InEnvironment},
utils::{generics, variant_data, Generics},
- Binders, CallableDefId, FnPointer, FnSig, InferTy, Mutability, Obligation, OpaqueTyId, Rawness,
- Scalar, Substs, TraitRef, Ty,
+ Binders, CallableDefId, FnPointer, FnSig, Mutability, Obligation, OpaqueTyId, Rawness, Scalar,
+ Substs, TraitRef, Ty,
};
use super::{
@@ -527,8 +528,8 @@ impl<'a> InferenceContext<'a> {
Ty::Scalar(Scalar::Int(_))
| Ty::Scalar(Scalar::Uint(_))
| Ty::Scalar(Scalar::Float(_))
- | Ty::Infer(InferTy::IntVar(..))
- | Ty::Infer(InferTy::FloatVar(..)) => inner_ty,
+ | Ty::InferenceVar(_, TyVariableKind::Integer)
+ | Ty::InferenceVar(_, TyVariableKind::Float) => inner_ty,
// Otherwise we resolve via the std::ops::Neg trait
_ => self
.resolve_associated_type(inner_ty, self.resolve_ops_neg_output()),
@@ -540,7 +541,7 @@ impl<'a> InferenceContext<'a> {
Ty::Scalar(Scalar::Bool)
| Ty::Scalar(Scalar::Int(_))
| Ty::Scalar(Scalar::Uint(_))
- | Ty::Infer(InferTy::IntVar(..)) => inner_ty,
+ | Ty::InferenceVar(_, TyVariableKind::Integer) => inner_ty,
// Otherwise we resolve via the std::ops::Not trait
_ => self
.resolve_associated_type(inner_ty, self.resolve_ops_not_output()),
@@ -761,7 +762,7 @@ impl<'a> InferenceContext<'a> {
// `!`).
if self.diverges.is_always() {
// we don't even make an attempt at coercion
- self.table.new_maybe_never_type_var()
+ self.table.new_maybe_never_var()
} else {
self.coerce(&Ty::unit(), expected.coercion_target());
Ty::unit()
diff --git a/crates/hir_ty/src/infer/unify.rs b/crates/hir_ty/src/infer/unify.rs
index 2852ad5bf72..b481aa1b33d 100644
--- a/crates/hir_ty/src/infer/unify.rs
+++ b/crates/hir_ty/src/infer/unify.rs
@@ -2,14 +2,15 @@
use std::borrow::Cow;
+use chalk_ir::{FloatTy, IntTy, TyVariableKind};
use ena::unify::{InPlaceUnificationTable, NoError, UnifyKey, UnifyValue};
use test_utils::mark;
use super::{InferenceContext, Obligation};
use crate::{
- BoundVar, Canonical, DebruijnIndex, GenericPredicate, InEnvironment, InferTy, Scalar, Substs,
- Ty, TyKind, TypeWalk,
+ BoundVar, Canonical, DebruijnIndex, GenericPredicate, InEnvironment, InferenceVar, Scalar,
+ Substs, Ty, TypeWalk,
};
impl<'a> InferenceContext<'a> {
@@ -26,7 +27,7 @@ where
'a: 'b,
{
ctx: &'b mut InferenceContext<'a>,
- free_vars: Vec<InferTy>,
+ free_vars: Vec<(InferenceVar, TyVariableKind)>,
/// A stack of type variables that is used to detect recursive types (which
/// are an error, but we need to protect against them to avoid stack
/// overflows).
@@ -36,17 +37,14 @@ where
#[derive(Debug)]
pub(super) struct Canonicalized<T> {
pub(super) value: Canonical<T>,
- free_vars: Vec<InferTy>,
+ free_vars: Vec<(InferenceVar, TyVariableKind)>,
}
-impl<'a, 'b> Canonicalizer<'a, 'b>
-where
- 'a: 'b,
-{
- fn add(&mut self, free_var: InferTy) -> usize {
- self.free_vars.iter().position(|&v| v == free_var).unwrap_or_else(|| {
+impl<'a, 'b> Canonicalizer<'a, 'b> {
+ fn add(&mut self, free_var: InferenceVar, kind: TyVariableKind) -> usize {
+ self.free_vars.iter().position(|&(v, _)| v == free_var).unwrap_or_else(|| {
let next_index = self.free_vars.len();
- self.free_vars.push(free_var);
+ self.free_vars.push((free_var, kind));
next_index
})
}
@@ -54,11 +52,11 @@ where
fn do_canonicalize<T: TypeWalk>(&mut self, t: T, binders: DebruijnIndex) -> T {
t.fold_binders(
&mut |ty, binders| match ty {
- Ty::Infer(tv) => {
- let inner = tv.to_inner();
+ Ty::InferenceVar(var, kind) => {
+ let inner = var.to_inner();
if self.var_stack.contains(&inner) {
// recursive type
- return tv.fallback_value();
+ return self.ctx.table.type_variable_table.fallback_value(var, kind);
}
if let Some(known_ty) =
self.ctx.table.var_unification_table.inlined_probe_value(inner).known()
@@ -69,13 +67,7 @@ where
result
} else {
let root = self.ctx.table.var_unification_table.find(inner);
- let free_var = match tv {
- InferTy::TypeVar(_) => InferTy::TypeVar(root),
- InferTy::IntVar(_) => InferTy::IntVar(root),
- InferTy::FloatVar(_) => InferTy::FloatVar(root),
- InferTy::MaybeNeverTypeVar(_) => InferTy::MaybeNeverTypeVar(root),
- };
- let position = self.add(free_var);
+ let position = self.add(InferenceVar::from_inner(root), kind);
Ty::Bound(BoundVar::new(binders, position))
}
}
@@ -86,19 +78,7 @@ where
}
fn into_canonicalized<T>(self, result: T) -> Canonicalized<T> {
- let kinds = self
- .free_vars
- .iter()
- .map(|v| match v {
- // mapping MaybeNeverTypeVar to the same kind as general ones
- // should be fine, because as opposed to int or float type vars,
- // they don't restrict what kind of type can go into them, they
- // just affect fallback.
- InferTy::TypeVar(_) | InferTy::MaybeNeverTypeVar(_) => TyKind::General,
- InferTy::IntVar(_) => TyKind::Integer,
- InferTy::FloatVar(_) => TyKind::Float,
- })
- .collect();
+ let kinds = self.free_vars.iter().map(|&(_, k)| k).collect();
Canonicalized { value: Canonical { value: result, kinds }, free_vars: self.free_vars }
}
@@ -132,7 +112,8 @@ impl<T> Canonicalized<T> {
&mut |ty, binders| {
if let &mut Ty::Bound(bound) = ty {
if bound.debruijn >= binders {
- *ty = Ty::Infer(self.free_vars[bound.index]);
+ let (v, k) = self.free_vars[bound.index];
+ *ty = Ty::InferenceVar(v, k);
}
}
},
@@ -152,18 +133,18 @@ impl<T> Canonicalized<T> {
.kinds
.iter()
.map(|k| match k {
- TyKind::General => ctx.table.new_type_var(),
- TyKind::Integer => ctx.table.new_integer_var(),
- TyKind::Float => ctx.table.new_float_var(),
+ TyVariableKind::General => ctx.table.new_type_var(),
+ TyVariableKind::Integer => ctx.table.new_integer_var(),
+ TyVariableKind::Float => ctx.table.new_float_var(),
})
.collect(),
);
for (i, ty) in solution.value.into_iter().enumerate() {
- let var = self.free_vars[i];
+ let (v, k) = self.free_vars[i];
// eagerly replace projections in the type; we may be getting types
// e.g. from where clauses where this hasn't happened yet
let ty = ctx.normalize_associated_types_in(ty.clone().subst_bound_vars(&new_vars));
- ctx.table.unify(&Ty::Infer(var), &ty);
+ ctx.table.unify(&Ty::InferenceVar(v, k), &ty);
}
}
}
@@ -197,32 +178,74 @@ pub(crate) fn unify(tys: &Canonical<(Ty, Ty)>) -> Option<Substs> {
)
}
+#[derive(Clone, Debug)]
+pub(super) struct TypeVariableTable {
+ inner: Vec<TypeVariableData>,
+}
+
+impl TypeVariableTable {
+ fn push(&mut self, data: TypeVariableData) {
+ self.inner.push(data);
+ }
+
+ pub(super) fn set_diverging(&mut self, iv: InferenceVar, diverging: bool) {
+ self.inner[iv.to_inner().0 as usize].diverging = diverging;
+ }
+
+ fn is_diverging(&mut self, iv: InferenceVar) -> bool {
+ self.inner[iv.to_inner().0 as usize].diverging
+ }
+
+ fn fallback_value(&self, iv: InferenceVar, kind: TyVariableKind) -> Ty {
+ match kind {
+ _ if self.inner[iv.to_inner().0 as usize].diverging => Ty::Never,
+ TyVariableKind::General => Ty::Unknown,
+ TyVariableKind::Integer => Ty::Scalar(Scalar::Int(IntTy::I32)),
+ TyVariableKind::Float => Ty::Scalar(Scalar::Float(FloatTy::F64)),
+ }
+ }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub(crate) struct TypeVariableData {
+ diverging: bool,
+}
+
#[derive(Clone, Debug)]
pub(crate) struct InferenceTable {
pub(super) var_unification_table: InPlaceUnificationTable<TypeVarId>,
+ pub(super) type_variable_table: TypeVariableTable,
}
impl InferenceTable {
pub(crate) fn new() -> Self {
- InferenceTable { var_unification_table: InPlaceUnificationTable::new() }
+ InferenceTable {
+ var_unification_table: InPlaceUnificationTable::new(),
+ type_variable_table: TypeVariableTable { inner: Vec::new() },
+ }
+ }
+
+ fn new_var(&mut self, kind: TyVariableKind, diverging: bool) -> Ty {
+ self.type_variable_table.push(TypeVariableData { diverging });
+ let key = self.var_unification_table.new_key(TypeVarValue::Unknown);
+ assert_eq!(key.0 as usize, self.type_variable_table.inner.len() - 1);
+ Ty::InferenceVar(InferenceVar::from_inner(key), kind)
}
pub(crate) fn new_type_var(&mut self) -> Ty {
- Ty::Infer(InferTy::TypeVar(self.var_unification_table.new_key(TypeVarValue::Unknown)))
+ self.new_var(TyVariableKind::General, false)
}
pub(crate) fn new_integer_var(&mut self) -> Ty {
- Ty::Infer(InferTy::IntVar(self.var_unification_table.new_key(TypeVarValue::Unknown)))
+ self.new_var(TyVariableKind::Integer, false)
}
pub(crate) fn new_float_var(&mut self) -> Ty {
- Ty::Infer(InferTy::FloatVar(self.var_unification_table.new_key(TypeVarValue::Unknown)))
+ self.new_var(TyVariableKind::Float, false)
}
- pub(crate) fn new_maybe_never_type_var(&mut self) -> Ty {
- Ty::Infer(InferTy::MaybeNeverTypeVar(
- self.var_unification_table.new_key(TypeVarValue::Unknown),
- ))
+ pub(crate) fn new_maybe_never_var(&mut self) -> Ty {
+ self.new_var(TyVariableKind::General, true)
}
pub(crate) fn resolve_ty_completely(&mut self, ty: Ty) -> Ty {
@@ -283,33 +306,46 @@ impl InferenceTable {
true
}
- (Ty::Infer(InferTy::TypeVar(tv1)), Ty::Infer(InferTy::TypeVar(tv2)))
- | (Ty::Infer(InferTy::IntVar(tv1)), Ty::Infer(InferTy::IntVar(tv2)))
- | (Ty::Infer(InferTy::FloatVar(tv1)), Ty::Infer(InferTy::FloatVar(tv2)))
+ (
+ Ty::InferenceVar(tv1, TyVariableKind::General),
+ Ty::InferenceVar(tv2, TyVariableKind::General),
+ )
| (
- Ty::Infer(InferTy::MaybeNeverTypeVar(tv1)),
- Ty::Infer(InferTy::MaybeNeverTypeVar(tv2)),
- ) => {
+ Ty::InferenceVar(tv1, TyVariableKind::Integer),
+ Ty::InferenceVar(tv2, TyVariableKind::Integer),
+ )
+ | (
+ Ty::InferenceVar(tv1, TyVariableKind::Float),
+ Ty::InferenceVar(tv2, TyVariableKind::Float),
+ ) if self.type_variable_table.is_diverging(*tv1)
+ == self.type_variable_table.is_diverging(*tv2) =>
+ {
// both type vars are unknown since we tried to resolve them
- self.var_unification_table.union(*tv1, *tv2);
+ self.var_unification_table.union(tv1.to_inner(), tv2.to_inner());
true
}
// The order of MaybeNeverTypeVar matters here.
// Unifying MaybeNeverTypeVar and TypeVar will let the latter become MaybeNeverTypeVar.
// Unifying MaybeNeverTypeVar and other concrete type will let the former become it.
- (Ty::Infer(InferTy::TypeVar(tv)), other)
- | (other, Ty::Infer(InferTy::TypeVar(tv)))
- | (Ty::Infer(InferTy::MaybeNeverTypeVar(tv)), other)
- | (other, Ty::Infer(InferTy::MaybeNeverTypeVar(tv)))
- | (Ty::Infer(InferTy::IntVar(tv)), other @ Ty::Scalar(Scalar::Int(_)))
- | (other @ Ty::Scalar(Scalar::Int(_)), Ty::Infer(InferTy::IntVar(tv)))
- | (Ty::Infer(InferTy::IntVar(tv)), other @ Ty::Scalar(Scalar::Uint(_)))
- | (other @ Ty::Scalar(Scalar::Uint(_)), Ty::Infer(InferTy::IntVar(tv)))
- | (Ty::Infer(InferTy::FloatVar(tv)), other @ Ty::Scalar(Scalar::Float(_)))
- | (other @ Ty::Scalar(Scalar::Float(_)), Ty::Infer(InferTy::FloatVar(tv))) => {
+ (Ty::InferenceVar(tv, TyVariableKind::General), other)
+ | (other, Ty::InferenceVar(tv, TyVariableKind::General))
+ | (Ty::InferenceVar(tv, TyVariableKind::Integer), other @ Ty::Scalar(Scalar::Int(_)))
+ | (other @ Ty::Scalar(Scalar::Int(_)), Ty::InferenceVar(tv, TyVariableKind::Integer))
+ | (
+ Ty::InferenceVar(tv, TyVariableKind::Integer),
+ other @ Ty::Scalar(Scalar::Uint(_)),
+ )
+ | (
+ other @ Ty::Scalar(Scalar::Uint(_)),
+ Ty::InferenceVar(tv, TyVariableKind::Integer),
+ )
+ | (Ty::InferenceVar(tv, TyVariableKind::Float), other @ Ty::Scalar(Scalar::Float(_)))
+ | (other @ Ty::Scalar(Scalar::Float(_)), Ty::InferenceVar(tv, TyVariableKind::Float)) =>
+ {
// the type var is unknown since we tried to resolve it
- self.var_unification_table.union_value(*tv, TypeVarValue::Known(other.clone()));
+ self.var_unification_table
+ .union_value(tv.to_inner(), TypeVarValue::Known(other.clone()));
true
}
@@ -354,7 +390,7 @@ impl InferenceTable {
mark::hit!(type_var_resolves_to_int_var);
}
match &*ty {
- Ty::Infer(tv) => {
+ Ty::InferenceVar(tv, _) => {
let inner = tv.to_inner();
match self.var_unification_table.inlined_probe_value(inner).known() {
Some(known_ty) => {
@@ -377,12 +413,12 @@ impl InferenceTable {
/// known type.
fn resolve_ty_as_possible_inner(&mut self, tv_stack: &mut Vec<TypeVarId>, ty: Ty) -> Ty {
ty.fold(&mut |ty| match ty {
- Ty::Infer(tv) => {
+ Ty::InferenceVar(tv, kind) => {
let inner = tv.to_inner();
if tv_stack.contains(&inner) {
mark::hit!(type_var_cycles_resolve_as_possible);
// recursive type
- return tv.fallback_value();
+ return self.type_variable_table.fallback_value(tv, kind);
}
if let Some(known_ty) =
self.var_unification_table.inlined_probe_value(inner).known()
@@ -404,12 +440,12 @@ impl InferenceTable {
/// replaced by Ty::Unknown.
fn resolve_ty_completely_inner(&mut self, tv_stack: &mut Vec<TypeVarId>, ty: Ty) -> Ty {
ty.fold(&mut |ty| match ty {
- Ty::Infer(tv) => {
+ Ty::InferenceVar(tv, kind) => {
let inner = tv.to_inner();
if tv_stack.contains(&inner) {
mark::hit!(type_var_cycles_resolve_completely);
// recursive type
- return tv.fallback_value();
+ return self.type_variable_table.fallback_value(tv, kind);
}
if let Some(known_ty) =
self.var_unification_table.inlined_probe_value(inner).known()
@@ -420,7 +456,7 @@ impl InferenceTable {
tv_stack.pop();
result
} else {
- tv.fallback_value()
+ self.type_variable_table.fallback_value(tv, kind)
}
}
_ => ty,
@@ -430,7 +466,7 @@ impl InferenceTable {
/// The ID of a type variable.
#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
-pub struct TypeVarId(pub(super) u32);
+pub(super) struct TypeVarId(pub(super) u32);
impl UnifyKey for TypeVarId {
type Value = TypeVarValue;
@@ -451,7 +487,7 @@ impl UnifyKey for TypeVarId {
/// The value of a type variable: either we already know the type, or we don't
/// know it yet.
#[derive(Clone, PartialEq, Eq, Debug)]
-pub enum TypeVarValue {
+pub(super) enum TypeVarValue {
Known(Ty),
Unknown,
}
diff --git a/crates/hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs
index 1abb0440fda..1131eaf9236 100644
--- a/crates/hir_ty/src/lib.rs
+++ b/crates/hir_ty/src/lib.rs
@@ -42,14 +42,14 @@ use crate::{
};
pub use autoderef::autoderef;
-pub use infer::{InferTy, InferenceResult};
+pub use infer::{InferenceResult, InferenceVar};
pub use lower::{
associated_type_shorthand_candidates, callable_item_sig, CallableDefId, ImplTraitLoweringMode,
TyDefId, TyLoweringContext, ValueTyDefId,
};
pub use traits::{InEnvironment, Obligation, ProjectionPredicate, TraitEnvironment};
-pub use chalk_ir::{BoundVar, DebruijnIndex, Scalar};
+pub use chalk_ir::{BoundVar, DebruijnIndex, Scalar, TyVariableKind};
#[derive(Clone, PartialEq, Eq, Debug, Hash)]
pub enum Lifetime {
@@ -218,7 +218,7 @@ pub enum Ty {
Bound(BoundVar),
/// A type variable used during type checking.
- Infer(InferTy),
+ InferenceVar(InferenceVar, TyVariableKind),
/// A trait object (`dyn Trait` or bare `Trait` in pre-2018 Rust).
///
@@ -527,22 +527,15 @@ impl TypeWalk for GenericPredicate {
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Canonical<T> {
pub value: T,
- pub kinds: Arc<[TyKind]>,
+ pub kinds: Arc<[TyVariableKind]>,
}
impl<T> Canonical<T> {
- pub fn new(value: T, kinds: impl IntoIterator<Item = TyKind>) -> Self {
+ pub fn new(value: T, kinds: impl IntoIterator<Item = TyVariableKind>) -> Self {
Self { value, kinds: kinds.into_iter().collect() }
}
}
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum TyKind {
- General,
- Integer,
- Float,
-}
-
/// A function signature as seen by type inference: Several parameter types and
/// one return type.
#[derive(Clone, PartialEq, Eq, Debug)]
diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs
index c8a0ad5f1f7..8b171787399 100644
--- a/crates/hir_ty/src/method_resolution.rs
+++ b/crates/hir_ty/src/method_resolution.rs
@@ -19,7 +19,7 @@ use crate::{
primitive::{self, FloatTy, IntTy, UintTy},
utils::all_super_traits,
Canonical, DebruijnIndex, FnPointer, FnSig, InEnvironment, Scalar, Substs, TraitEnvironment,
- TraitRef, Ty, TyKind, TypeWalk,
+ TraitRef, Ty, TypeWalk,
};
/// This is used as a key for indexing impls.
@@ -667,7 +667,7 @@ pub(crate) fn inherent_impl_substs(
.build();
let self_ty_with_vars = db.impl_self_ty(impl_id).subst(&vars);
let mut kinds = self_ty.kinds.to_vec();
- kinds.extend(iter::repeat(TyKind::General).take(vars.len()));
+ kinds.extend(iter::repeat(chalk_ir::TyVariableKind::General).take(vars.len()));
let tys = Canonical { kinds: kinds.into(), value: (self_ty_with_vars, self_ty.value.clone()) };
let substs = super::infer::unify(&tys);
// We only want the substs for the vars we added, not the ones from self_ty.
@@ -759,7 +759,7 @@ fn generic_implements_goal(
.push(self_ty.value)
.fill_with_bound_vars(DebruijnIndex::INNERMOST, kinds.len())
.build();
- kinds.extend(iter::repeat(TyKind::General).take(substs.len() - 1));
+ kinds.extend(iter::repeat(chalk_ir::TyVariableKind::General).take(substs.len() - 1));
let trait_ref = TraitRef { trait_, substs };
let obligation = super::Obligation::Trait(trait_ref);
Canonical { kinds: kinds.into(), value: InEnvironment::new(env, obligation) }
diff --git a/crates/hir_ty/src/op.rs b/crates/hir_ty/src/op.rs
index 1c01a67ade1..bb9b8bbfcd8 100644
--- a/crates/hir_ty/src/op.rs
+++ b/crates/hir_ty/src/op.rs
@@ -1,7 +1,8 @@
//! Helper functions for binary operator type inference.
+use chalk_ir::TyVariableKind;
use hir_def::expr::{ArithOp, BinaryOp, CmpOp};
-use crate::{InferTy, Scalar, Ty};
+use crate::{Scalar, Ty};
pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
match op {
@@ -11,14 +12,16 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty {
Ty::Scalar(Scalar::Int(_))
| Ty::Scalar(Scalar::Uint(_))
| Ty::Scalar(Scalar::Float(_)) => lhs_ty,
- Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => lhs_ty,
+ Ty::InferenceVar(_, TyVariableKind::Integer)
+ | Ty::InferenceVar(_, TyVariableKind::Float) => lhs_ty,
_ => Ty::Unknown,
},
BinaryOp::ArithOp(_) => match rhs_ty {
Ty::Scalar(Scalar::Int(_))
| Ty::Scalar(Scalar::Uint(_))
| Ty::Scalar(Scalar::Float(_)) => rhs_ty,
- Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => rhs_ty,
+ Ty::InferenceVar(_, TyVariableKind::Integer)
+ | Ty::InferenceVar(_, TyVariableKind::Float) => rhs_ty,
_ => Ty::Unknown,
},
}
@@ -30,7 +33,8 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty {
BinaryOp::Assignment { op: None } => lhs_ty,
BinaryOp::CmpOp(CmpOp::Eq { .. }) => match lhs_ty {
Ty::Scalar(_) | Ty::Str => lhs_ty,
- Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => lhs_ty,
+ Ty::InferenceVar(_, TyVariableKind::Integer)
+ | Ty::InferenceVar(_, TyVariableKind::Float) => lhs_ty,
_ => Ty::Unknown,
},
BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => Ty::Unknown,
@@ -40,7 +44,8 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty {
Ty::Scalar(Scalar::Int(_))
| Ty::Scalar(Scalar::Uint(_))
| Ty::Scalar(Scalar::Float(_)) => lhs_ty,
- Ty::Infer(InferTy::IntVar(..)) | Ty::Infer(InferTy::FloatVar(..)) => lhs_ty,
+ Ty::InferenceVar(_, TyVariableKind::Integer)
+ | Ty::InferenceVar(_, TyVariableKind::Float) => lhs_ty,
_ => Ty::Unknown,
},
}
diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs
index 60d74e21abd..995ff6a9a7e 100644
--- a/crates/hir_ty/src/traits/chalk/mapping.rs
+++ b/crates/hir_ty/src/traits/chalk/mapping.rs
@@ -17,7 +17,7 @@ use crate::{
primitive::UintTy,
traits::{Canonical, Obligation},
CallableDefId, FnPointer, FnSig, GenericPredicate, InEnvironment, OpaqueTy, OpaqueTyId,
- ProjectionPredicate, ProjectionTy, Scalar, Substs, TraitEnvironment, TraitRef, Ty, TyKind,
+ ProjectionPredicate, ProjectionTy, Scalar, Substs, TraitEnvironment, TraitRef, Ty,
};
use super::interner::*;
@@ -107,7 +107,7 @@ impl ToChalk for Ty {
.to_ty::<Interner>(&Interner)
}
Ty::Bound(idx) => chalk_ir::TyKind::BoundVar(idx).intern(&Interner),
- Ty::Infer(_infer_ty) => panic!("uncanonicalized infer ty"),
+ Ty::InferenceVar(..) => panic!("uncanonicalized infer ty"),
Ty::Dyn(predicates) => {
let where_clauses = chalk_ir::QuantifiedWhereClauses::from_iter(
&Interner,
@@ -532,20 +532,12 @@ where
type Chalk = chalk_ir::Canonical<T::Chalk>;
fn to_chalk(self, db: &dyn HirDatabase) -> chalk_ir::Canonical<T::Chalk> {
- let kinds = self
- .kinds
- .iter()
- .map(|k| match k {
- TyKind::General => chalk_ir::TyVariableKind::General,
- TyKind::Integer => chalk_ir::TyVariableKind::Integer,
- TyKind::Float => chalk_ir::TyVariableKind::Float,
- })
- .map(|tk| {
- chalk_ir::CanonicalVarKind::new(
- chalk_ir::VariableKind::Ty(tk),
- chalk_ir::UniverseIndex::ROOT,
- )
- });
+ let kinds = self.kinds.iter().map(|&tk| {
+ chalk_ir::CanonicalVarKind::new(
+ chalk_ir::VariableKind::Ty(tk),
+ chalk_ir::UniverseIndex::ROOT,
+ )
+ });
let value = self.value.to_chalk(db);
chalk_ir::Canonical {
value,
@@ -558,17 +550,13 @@ where
.binders
.iter(&Interner)
.map(|k| match k.kind {
- chalk_ir::VariableKind::Ty(tk) => match tk {
- chalk_ir::TyVariableKind::General => TyKind::General,
- chalk_ir::TyVariableKind::Integer => TyKind::Integer,
- chalk_ir::TyVariableKind::Float => TyKind::Float,
- },
+ chalk_ir::VariableKind::Ty(tk) => tk,
// HACK: Chalk can sometimes return new lifetime variables. We
// want to just skip them, but to not mess up the indices of
// other variables, we'll just create a new type variable in
// their place instead. This should not matter (we never see the
// actual *uses* of the lifetime variable).
- chalk_ir::VariableKind::Lifetime => TyKind::General,
+ chalk_ir::VariableKind::Lifetime => chalk_ir::TyVariableKind::General,
chalk_ir::VariableKind::Const(_) => panic!("unexpected const from Chalk"),
})
.collect();