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

Inline TypeCtor into Ty

Browse source
This commit is contained in:
Lukas Wirth 2021-02-28 19:13:37 +01:00
parent 7c2dd85a32
commit a3f5491a1a
17 changed files with 704 additions and 937 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/hir_ty/src/diagnostics/expr.rs
View file

@ -17,7 +17,7 @@ use crate::{
MissingPatFields, RemoveThisSemicolon,
},
utils::variant_data,
ApplicationTy, InferenceResult, Ty, TypeCtor,
InferenceResult, Ty,
};
pub(crate) use hir_def::{
@ -381,14 +381,11 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
_ => return,
};
let core_result_ctor = TypeCtor::Adt(AdtId::EnumId(core_result_enum));
let core_option_ctor = TypeCtor::Adt(AdtId::EnumId(core_option_enum));
let (params, required) = match &mismatch.expected {
Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &core_result_ctor => {
let (params, required) = match mismatch.expected {
Ty::Adt(AdtId::EnumId(enum_id), ref parameters) if enum_id == core_result_enum => {
(parameters, "Ok".to_string())
}
Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &core_option_ctor => {
Ty::Adt(AdtId::EnumId(enum_id), ref parameters) if enum_id == core_option_enum => {
(parameters, "Some".to_string())
}
_ => return,