language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename hypothetical -> speculative

Browse source
This commit is contained in:
Aleksey Kladov 2020-08-14 15:23:27 +02:00
parent 1ec23e7d33
commit 125744c057
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ssr/src/resolving.rs
View file

@ -212,13 +212,13 @@ impl<'db> ResolutionScope<'db> {
// First try resolving the whole path. This will work for things like
// `std::collections::HashMap`, but will fail for things like
// `std::collections::HashMap::new`.
if let Some(resolution) = self.scope.resolve_hypothetical(&path) {
if let Some(resolution) = self.scope.speculative_resolve(&path) {
return Some(resolution);
}
// Resolution failed, try resolving the qualifier (e.g. `std::collections::HashMap` and if
// that succeeds, then iterate through the candidates on the resolved type with the provided
// name.
let resolved_qualifier = self.scope.resolve_hypothetical(&path.qualifier()?)?;
let resolved_qualifier = self.scope.speculative_resolve(&path.qualifier()?)?;
if let hir::PathResolution::Def(hir::ModuleDef::Adt(adt)) = resolved_qualifier {
let name = path.segment()?.name_ref()?;
adt.ty(self.scope.db).iterate_path_candidates(