language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename combine -> or

Browse source 
This way we match API of Option

https://doc.rust-lang.org/std/option/enum.Option.html#method.or
This commit is contained in:
Aleksey Kladov 2019-02-11 17:29:20 +03:00
parent 821d980fd9
commit 8cafdb3a99
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_hir/src/resolve.rs
View file

@ -59,7 +59,7 @@ impl Resolver {
pub fn resolve_name(&self, name: &Name) -> PerNs<Resolution> {
let mut resolution = PerNs::none();
for scope in self.scopes.iter().rev() {
resolution = resolution.combine(scope.resolve_name(name));
resolution = resolution.or(scope.resolve_name(name));
if resolution.is_both() {
return resolution;
}