rename combine -> or

This way we match API of Option

https://doc.rust-lang.org/std/option/enum.Option.html#method.or

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 4b80972353a4ab66d851592c93b84c1c47f56ee3..261ebdf97a076f56655b259d701a38be291e5ac7 100644 (file)
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -135,7 +135,7 @@ pub fn as_ref(&self) -> PerNs<&T> {
         PerNs { types: self.types.as_ref(), values: self.values.as_ref() }
     }
 
-    pub fn combine(self, other: PerNs<T>) -> PerNs<T> {
+    pub fn or(self, other: PerNs<T>) -> PerNs<T> {
         PerNs { types: self.types.or(other.types), values: self.values.or(other.values) }
     }
 
@@ -439,7 +439,7 @@ pub(crate) fn resolve_name_in_module(&self, module: Module, name: &Name) -> PerN
         let from_extern_prelude =
             self.extern_prelude.get(name).map_or(PerNs::none(), |&it| PerNs::types(it));
 
-        from_scope.combine(from_extern_prelude)
+        from_scope.or(from_extern_prelude)
     }
 
     // Returns Yes if we are sure that additions to `ItemMap` wouldn't change

diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
index e8abac5bc95cdef22cf7185714aa909bc53671d3..40c860cf49509704582ac1c893277c9d8e53f0ae 100644 (file)
--- a/crates/ra_hir/src/resolve.rs
+++ b/crates/ra_hir/src/resolve.rs
@@ -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;
             }