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

Use lang-items to resolve future trait

Browse source
This commit is contained in:
Aleksey Kladov 2020-01-14 11:13:07 +01:00
parent aedff7cdcf
commit 0358f5fdeb
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ra_hir/src/source_analyzer.rs
View file

@ -15,7 +15,6 @@ use hir_def::{
},
expr::{ExprId, PatId},
nameres::ModuleSource,
path::path,
resolver::{self, resolver_for_scope, HasResolver, Resolver, TypeNs, ValueNs},
AssocItemId, DefWithBodyId,
};
@ -399,20 +398,20 @@ impl SourceAnalyzer {
/// Checks that particular type `ty` implements `std::future::Future`.
/// This function is used in `.await` syntax completion.
pub fn impls_future(&self, db: &impl HirDatabase, ty: Type) -> bool {
let std_future_path = path![std::future::Future];
let std_future_trait = match self.resolver.resolve_known_trait(db, &std_future_path) {
Some(it) => it.into(),
_ => return false,
};
let krate = match self.resolver.krate() {
Some(krate) => krate,
_ => return false,
None => return false,
};
let std_future_trait =
db.lang_item(krate, "future_trait".into()).and_then(|it| it.as_trait());
let std_future_trait = match std_future_trait {
Some(it) => it,
None => return false,
};
let canonical_ty = Canonical { value: ty.ty.value, num_vars: 0 };
implements_trait(&canonical_ty, db, &self.resolver, krate.into(), std_future_trait)
implements_trait(&canonical_ty, db, &self.resolver, krate, std_future_trait)
}
pub fn expand(