Merge #5814

5814: Add SelfParam to code_model
 r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

2 files changed, 2 insertions, 2 deletions

diff --git a/crates/ssr/src/matching.rs b/crates/ssr/src/matching.rs
index 8bb5ced90..26968c474 100644
--- a/crates/ssr/src/matching.rs
+++ b/crates/ssr/src/matching.rs
@@ -545,7 +545,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> {
         // If the function we're calling takes a self parameter, then we store additional
         // information on the placeholder match about autoderef and autoref. This allows us to use
         // the placeholder in a context where autoderef and autoref don't apply.
-        if code_resolved_function.has_self_param(self.sema.db) {
+        if code_resolved_function.self_param(self.sema.db).is_some() {
             if let (Some(pattern_type), Some(expr)) = (&pattern_ufcs.qualifier_type, &code.expr()) {
                 let deref_count = self.check_expr_type(pattern_type, expr)?;
                 let pattern_receiver = pattern_args.next();
diff --git a/crates/ssr/src/resolving.rs b/crates/ssr/src/resolving.rs
index b932132d5..5d2cbec47 100644
--- a/crates/ssr/src/resolving.rs
+++ b/crates/ssr/src/resolving.rs
@@ -165,7 +165,7 @@ impl Resolver<'_, '_> {
     fn ok_to_use_path_resolution(&self, resolution: &hir::PathResolution) -> bool {
         match resolution {
             hir::PathResolution::AssocItem(hir::AssocItem::Function(function)) => {
-                if function.has_self_param(self.resolution_scope.scope.db) {
+                if function.self_param(self.resolution_scope.scope.db).is_some() {
                     // If we don't use this path resolution, then we won't be able to match method
                     // calls. e.g. `Foo::bar($s)` should match `x.bar()`.
                     true