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

Id-ify Ty::Adt

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-26 14:29:12 +03:00
parent e5eadb3390
commit a443b5033c
11 changed files with 98 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir/src/expr.rs
View file

@ -2,7 +2,7 @@
use std::sync::Arc;
use hir_def::{path::known, resolver::HasResolver};
use hir_def::{path::known, resolver::HasResolver, AdtId};
use hir_expand::diagnostics::DiagnosticSink;
use ra_syntax::ast;
use ra_syntax::AstPtr;
@ -127,7 +127,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
_ => return,
};
let std_result_ctor = TypeCtor::Adt(Adt::Enum(std_result_enum.into()));
let std_result_ctor = TypeCtor::Adt(AdtId::EnumId(std_result_enum));
let params = match &mismatch.expected {
Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &std_result_ctor => parameters,
_ => return,