[pkgsrc/trunk]: pkgsrc/lang/rust-analyzer rust-analyzer: fix building for pre...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0830191ab083
branches:  trunk
changeset: 375510:0830191ab083
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Mar 15 05:59:40 2022 +0000

description:
rust-analyzer: fix building for pre-1.59.0

diffstat:

 lang/rust-analyzer/distinfo                                           |   3 +-
 lang/rust-analyzer/patches/patch-crates_ide_completion_src_context.rs |  17 ++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r 81112d323aad -r 0830191ab083 lang/rust-analyzer/distinfo
--- a/lang/rust-analyzer/distinfo       Tue Mar 15 05:53:26 2022 +0000
+++ b/lang/rust-analyzer/distinfo       Tue Mar 15 05:59:40 2022 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2022/03/14 11:11:27 adam Exp $
+$NetBSD: distinfo,v 1.14 2022/03/15 05:59:40 adam Exp $
 
 BLAKE2s (addr2line-0.17.0.crate) = f7fa3b016f0e80c4ea9967f8947de15edc9fa39d0c0cdea692dccd0c41c28039
 SHA512 (addr2line-0.17.0.crate) = ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
@@ -519,3 +519,4 @@
 BLAKE2s (xshell-macros-0.1.17.crate) = 98fe6d6cfdf1931df28789287100a183c72f2b65daf1d9e4e8b98d9cddcbb695
 SHA512 (xshell-macros-0.1.17.crate) = 838f8bfc530051d8fe6c1b2a3c8e2fe7c6946705d6e6a084807b35817d5d6bae6f2941cb97a47fdf5c970aa3f4baef222aac938039bb520aadbb3fd7fd1a7bf7
 Size (xshell-macros-0.1.17.crate) = 2682 bytes
+SHA1 (patch-crates_ide_completion_src_context.rs) = 5a5a0f25350ca909a4d7c73e29a2738db9d92c99
diff -r 81112d323aad -r 0830191ab083 lang/rust-analyzer/patches/patch-crates_ide_completion_src_context.rs
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/rust-analyzer/patches/patch-crates_ide_completion_src_context.rs     Tue Mar 15 05:59:40 2022 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-crates_ide_completion_src_context.rs,v 1.1 2022/03/15 05:59:41 adam Exp $
+
+For for pre-1.59.0.
+
+--- crates/ide_completion/src/context.rs.orig  2022-03-15 05:54:01.000000000 +0000
++++ crates/ide_completion/src/context.rs
+@@ -747,7 +747,9 @@ impl<'a> CompletionContext<'a> {
+                 it.syntax().text_range().end() == syntax_element.text_range().end()
+             });
+ 
+-        (self.expected_type, self.expected_name) = self.expected_type_and_name();
++        let (expected_type, expected_name) = self.expected_type_and_name();
++        self.expected_type = expected_type;
++        self.expected_name = expected_name;
+ 
+         // Overwrite the path kind for derives
+         if let Some((original_file, file_with_fake_ident, offset)) = derive_ctx {