language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Reduce variants of Expr

Browse source
This commit is contained in:
oxalica 2019-11-29 14:49:12 +08:00
parent 4992d2bf79
commit 2cb684bbce
No known key found for this signature in database
GPG key ID: CED392DE0C483D00
3 changed files with 56 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

76
crates/ra_hir_ty/src/infer/expr.rs
View file

@ -12,6 +12,7 @@ use hir_def::{
AdtId, ContainerId, Lookup, StructFieldId,
};
use hir_expand::name::{self, Name};
use ra_syntax::ast::RangeOp;
use crate::{
autoderef, db::HirDatabase, method_resolution, op, traits::InEnvironment, utils::variant_data,
@ -415,45 +416,42 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
}
_ => Ty::Unknown,
},
Expr::RangeFull => match self.resolve_range_full() {
Some(adt) => Ty::simple(TypeCtor::Adt(adt)),
None => Ty::Unknown,
},
Expr::Range { lhs, rhs } => {
let lhs_ty = self.infer_expr(*lhs, &Expectation::none());
let rhs_ty = self.infer_expr(*rhs, &Expectation::has_type(lhs_ty));
match self.resolve_range() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), rhs_ty),
None => Ty::Unknown,
}
}
Expr::RangeInclusive { lhs, rhs } => {
let lhs_ty = self.infer_expr(*lhs, &Expectation::none());
let rhs_ty = self.infer_expr(*rhs, &Expectation::has_type(lhs_ty));
match self.resolve_range_inclusive() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), rhs_ty),
None => Ty::Unknown,
}
}
Expr::RangeFrom { lhs } => {
let ty = self.infer_expr(*lhs, &Expectation::none());
match self.resolve_range_from() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
}
}
Expr::RangeTo { rhs } => {
let ty = self.infer_expr(*rhs, &Expectation::none());
match self.resolve_range_to() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
}
}
Expr::RangeToInclusive { rhs } => {
let ty = self.infer_expr(*rhs, &Expectation::none());
match self.resolve_range_to_inclusive() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
Expr::Range { lhs, rhs, range_type } => {
let lhs_ty = lhs.map(|e| self.infer_expr(e, &Expectation::none()));
let rhs_expect = lhs_ty
.as_ref()
.map_or_else(Expectation::none, |ty| Expectation::has_type(ty.clone()));
let rhs_ty = rhs.map(|e| self.infer_expr(e, &rhs_expect));
match (range_type, lhs_ty, rhs_ty) {
(RangeOp::Exclusive, None, None) => match self.resolve_range_full() {
Some(adt) => Ty::simple(TypeCtor::Adt(adt)),
None => Ty::Unknown,
},
(RangeOp::Exclusive, None, Some(ty)) => match self.resolve_range_to() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
},
(RangeOp::Inclusive, None, Some(ty)) => {
match self.resolve_range_to_inclusive() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
}
}
(RangeOp::Exclusive, Some(_), Some(ty)) => match self.resolve_range() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
},
(RangeOp::Inclusive, Some(_), Some(ty)) => {
match self.resolve_range_inclusive() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
}
}
(RangeOp::Exclusive, Some(ty), None) => match self.resolve_range_from() {
Some(adt) => Ty::apply_one(TypeCtor::Adt(adt), ty),
None => Ty::Unknown,
},
(RangeOp::Inclusive, _, None) => Ty::Unknown,
}
}
Expr::Index { base, index } => {