File: 0017-Update-to-rust-stable.patch

package info (click to toggle)
ycmd 0%2B20240823%2Bgit8b61f19%2Bds-4
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 8,040 kB
  • sloc: python: 44,018; cpp: 6,138; java: 486; sh: 378; cs: 207; javascript: 150; ansic: 82; makefile: 45; xml: 18; objc: 10
file content (39 lines) | stat: -rw-r--r-- 1,296 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From 0d9f38918c212f10878923b7dfdcb2d839bf940f Mon Sep 17 00:00:00 2001
From: Ben Jackson <puremourning@gmail.com>
Date: Thu, 16 Oct 2025 19:54:27 +0100
Subject: [PATCH] Update to rust stable

---
 build.py                            | 2 +-
 ycmd/tests/rust/subcommands_test.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.py b/build.py
index 9ca9759b..5e45b26d 100755
--- a/build.py
+++ b/build.py
@@ -95,7 +95,7 @@ JDTLS_SHA256 = (
   '7416fc62befa450e32f06ec2b503f2eec5f22f0b1cc12f7b8ee5112bf671cf11'
 )
 
-DEFAULT_RUST_TOOLCHAIN = 'nightly-2024-12-12'
+DEFAULT_RUST_TOOLCHAIN = 'stable'
 RUST_ANALYZER_DIR = p.join( DIR_OF_THIRD_PARTY, 'rust-analyzer' )
 
 BUILD_ERROR_MESSAGE = (
diff --git a/ycmd/tests/rust/subcommands_test.py b/ycmd/tests/rust/subcommands_test.py
index a77b3fe8..aa7d83cd 100644
--- a/ycmd/tests/rust/subcommands_test.py
+++ b/ycmd/tests/rust/subcommands_test.py
@@ -562,7 +562,7 @@ class SubcommandsTest( TestCase ):
     filepath = PathToTestFile( 'common', 'src', 'main.rs' )
 
     for line, column, choice, chunks in [
-      ( 18, 2, 2, [
+      ( 18, 2, 4, [
         ChunkMatcher( 'pub(crate) ',
                       LocationMatcher( filepath, 18, 1 ),
                       LocationMatcher( filepath, 18, 1 ) ) ] ),
-- 
2.51.0