Rebase and update test

rust-lang · Nov 5, 2022 · 7df4b0b · 7df4b0b
1 parent 7e38c8a
commit 7df4b0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/compiler/rustc_hir_typeck/src/method/suggest.rs b/compiler/rustc_hir_typeck/src/method/suggest.rs
@@ -399,7 +399,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 if static_candidates.len() == 1 {
                     let mut has_unsuggestable_args = false;
                     let ty_str = if let Some(CandidateSource::Impl(impl_did)) =
-                    static_candidates.get(0)
+                        static_candidates.get(0)
                     {
                         // When the "method" is resolved through dereferencing, we really want the
                         // original type that has the associated function for accurate suggestions.
@@ -453,7 +453,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         self.ty_to_value_string(actual.peel_refs())
                     };
                     if let SelfSource::MethodCall(_) = source {
-                        let first_arg = if let Some(CandidateSource::Impl(impl_did)) = static_sources.get(0) &&
+                        let first_arg = if let Some(CandidateSource::Impl(impl_did)) = static_candidates.get(0) &&
                             let Some(assoc) = self.associated_value(*impl_did, item_name) {
                             let sig = self.tcx.fn_sig(assoc.def_id);
                             if let Some(first) = sig.inputs().skip_binder().get(0) {

diff --git a/src/test/ui/suggestions/issue-102354.stderr b/src/test/ui/suggestions/issue-102354.stderr
@@ -13,7 +13,7 @@ LL |     fn func() {}
 help: use associated function syntax instead
    |
 LL |     i32::func();
-   |     ~~~~~~~~~
+   |     ~~~~~~~~~~~
 help: disambiguate the associated function for the candidate
    |
 LL |     <i32 as Trait>::func(x);