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

Make known paths use core instead of std

Browse source
This commit is contained in:
Jonas Schievink 2020-06-11 16:22:31 +02:00
parent 32157d48f4
commit 90331ea035
7 changed files with 52 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_hir_ty/src/expr.rs
View file

@ -226,17 +226,19 @@ impl<'a, 'b> ExprValidator<'a, 'b> {
None => return,
};
let std_result_path = path![std::result::Result];
let core_result_path = path![core::result::Result];
let resolver = self.func.resolver(db.upcast());
let std_result_enum = match resolver.resolve_known_enum(db.upcast(), &std_result_path) {
let core_result_enum = match resolver.resolve_known_enum(db.upcast(), &core_result_path) {
Some(it) => it,
_ => return,
};
let std_result_ctor = TypeCtor::Adt(AdtId::EnumId(std_result_enum));
let core_result_ctor = TypeCtor::Adt(AdtId::EnumId(core_result_enum));
let params = match &mismatch.expected {
Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &std_result_ctor => parameters,
Ty::Apply(ApplicationTy { ctor, parameters }) if ctor == &core_result_ctor => {
parameters
}
_ => return,
};