diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-11-15 01:52:22 +0000 |
| commit | 097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf (patch) | |
| tree | daa93c64489cab0512bad7c4e5f4b3b848bf7859 /user/rust/0040-rls-atomics.patch | |
| parent | 950827890cca5caf633480047da6115f43b1a529 (diff) | |
| parent | 18b490b7953735328501c6f7e54522a91220caf3 (diff) | |
| download | packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.gz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.bz2 packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.tar.xz packages-097e4722ba191ed4ab4e51766c6fe9a23a3e0ecf.zip | |
Merge branch 'rust' into 'master'
user/rust: Bump to 1.30.1
See merge request !105
Diffstat (limited to 'user/rust/0040-rls-atomics.patch')
| -rw-r--r-- | user/rust/0040-rls-atomics.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/user/rust/0040-rls-atomics.patch b/user/rust/0040-rls-atomics.patch index 61811ef4d..4dd813faa 100644 --- a/user/rust/0040-rls-atomics.patch +++ b/user/rust/0040-rls-atomics.patch @@ -1,17 +1,17 @@ diff --git a/src/tools/rls/src/cmd.rs b/src/tools/rls/src/cmd.rs -index 545a129..8285f99 100644 +index 64035aa..d9129d8 100644 --- a/src/tools/rls/src/cmd.rs +++ b/src/tools/rls/src/cmd.rs -@@ -16,7 +16,7 @@ use crate::actions::requests; - use rls_analysis::{AnalysisHost, Target}; - use crate::config::Config; +@@ -17,7 +17,7 @@ use crate::config::Config; use crate::server::{self, LsService, Notification, Request, RequestId}; + use rls_analysis::{AnalysisHost, Target}; + use rls_vfs::Vfs; -use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::atomic::{AtomicU32, Ordering}; - use rls_vfs::Vfs; use languageserver_types::{ -@@ -415,8 +415,8 @@ fn url(file_name: &str) -> Url { + ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem, +@@ -424,8 +424,8 @@ fn url(file_name: &str) -> Url { } fn next_id() -> RequestId { @@ -23,7 +23,7 @@ index 545a129..8285f99 100644 // Custom reader and output for the RLS server. diff --git a/src/tools/rls/src/server/io.rs b/src/tools/rls/src/server/io.rs -index 5d5060e..55ab545 100644 +index 7b93d4a..f3c5361 100644 --- a/src/tools/rls/src/server/io.rs +++ b/src/tools/rls/src/server/io.rs @@ -17,7 +17,7 @@ use crate::lsp_data::{LSPNotification, LSPRequest}; |