diff options
| author | Samuel Holland <samuel@sholland.org> | 2022-04-30 04:27:44 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | 36ba9dd47f31bfbe4811b03df9a2871c43857219 (patch) | |
| tree | 2637bf028a2ab8f6e4598f11b1afb84824fdcb64 /user/rust/0040-rls-atomics.patch | |
| parent | 04e62b2391dc7f829349c87e1cc71597731e3c88 (diff) | |
| download | packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.gz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.bz2 packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.tar.xz packages-36ba9dd47f31bfbe4811b03df9a2871c43857219.zip | |
user/rust: Bump to 1.60.0
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'user/rust/0040-rls-atomics.patch')
| -rw-r--r-- | user/rust/0040-rls-atomics.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/user/rust/0040-rls-atomics.patch b/user/rust/0040-rls-atomics.patch index d9aedb9af..e084217ba 100644 --- a/user/rust/0040-rls-atomics.patch +++ b/user/rust/0040-rls-atomics.patch @@ -1,5 +1,5 @@ ---- rustc-1.35.0-src/src/tools/rls/rls/src/cmd.rs -+++ rustc-1.35.0-src/src/tools/rls/rls/src/cmd.rs +--- rustc-1.58.1-src/src/tools/rls/rls/src/cmd.rs ++++ rustc-1.58.1-src/src/tools/rls/rls/src/cmd.rs @@ -7,7 +7,7 @@ use crate::config::Config; use crate::server::{self, LsService, Notification, Request, RequestId}; use rls_analysis::{AnalysisHost, Target}; @@ -9,7 +9,7 @@ use lsp_types::{ ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem, -@@ -313,8 +313,8 @@ fn url(file_name: &str) -> Url { +@@ -316,8 +316,8 @@ fn url(file_name: &str) -> Url { } fn next_id() -> RequestId { @@ -20,9 +20,9 @@ } // Custom reader and output for the RLS server. ---- rustc-1.35.0-src/src/tools/rls/rls/src/server/io.rs -+++ rustc-1.35.0-src/src/tools/rls/rls/src/server/io.rs -@@ -7,7 +7,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest}; +--- rustc-1.58.1-src/src/tools/rls/rls/src/server/io.rs ++++ rustc-1.58.1-src/src/tools/rls/rls/src/server/io.rs +@@ -5,7 +5,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest}; use std::fmt; use std::io::{self, BufRead, Write}; @@ -31,7 +31,7 @@ use std::sync::Arc; use jsonrpc_core::{self as jsonrpc, response, version, Id}; -@@ -171,13 +171,13 @@ pub trait Output: Sync + Send + Clone + 'static { +@@ -169,13 +169,13 @@ pub trait Output: Sync + Send + Clone + 'static { /// An output that sends notifications and responses on `stdout`. #[derive(Clone)] pub(super) struct StdioOutput { @@ -47,7 +47,7 @@ } } -@@ -194,7 +194,7 @@ impl Output for StdioOutput { +@@ -192,7 +192,7 @@ impl Output for StdioOutput { } fn provide_id(&self) -> RequestId { |