diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2024-12-20 11:07:05 +0100 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2024-12-20 11:55:02 +0100 |
| commit | 23e2f8aa8662daee809dce4f8eef6932628d3836 (patch) | |
| tree | b2488d98e66ce7d989376a57bc94f2ad8e82fe69 /src/tools/rust-analyzer/lib | |
| parent | 4aa34abe649f0521dc361b71004cf3dfa3e2addc (diff) | |
internal: Split serde derive feature into `serde_derive` usage
Ideally we'd not have any dependency pull in the derive feature for faster build times, once that is the case this change would have an actual effect. See https://github.com/matklad/macro-dep-test/blob/master/README.md for context.
Diffstat (limited to 'src/tools/rust-analyzer/lib')
| -rw-r--r-- | src/tools/rust-analyzer/lib/lsp-server/Cargo.toml | 5 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/lib/lsp-server/src/msg.rs | 9 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/lib/lsp-server/src/req_queue.rs | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/rust-analyzer/lib/lsp-server/Cargo.toml b/src/tools/rust-analyzer/lib/lsp-server/Cargo.toml index cce007ae54c..2fa3272e659 100644 --- a/src/tools/rust-analyzer/lib/lsp-server/Cargo.toml +++ b/src/tools/rust-analyzer/lib/lsp-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lsp-server" -version = "0.7.7" +version = "0.7.8" description = "Generic LSP server scaffold." license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-server" @@ -9,7 +9,8 @@ edition = "2021" [dependencies] log = "0.4.17" serde_json = "1.0.108" -serde = { version = "1.0.192", features = ["derive"] } +serde = { version = "1.0.216" } +serde_derive = { version = "1.0.216" } crossbeam-channel.workspace = true [dev-dependencies] diff --git a/src/tools/rust-analyzer/lib/lsp-server/src/msg.rs b/src/tools/rust-analyzer/lib/lsp-server/src/msg.rs index 53c64796f28..11f98f50790 100644 --- a/src/tools/rust-analyzer/lib/lsp-server/src/msg.rs +++ b/src/tools/rust-analyzer/lib/lsp-server/src/msg.rs @@ -3,7 +3,8 @@ use std::{ io::{self, BufRead, Write}, }; -use serde::{de::DeserializeOwned, Deserialize, Serialize}; +use serde::de::DeserializeOwned; +use serde_derive::{Deserialize, Serialize}; use crate::error::ExtractError; @@ -196,7 +197,7 @@ impl Message { } impl Response { - pub fn new_ok<R: Serialize>(id: RequestId, result: R) -> Response { + pub fn new_ok<R: serde::Serialize>(id: RequestId, result: R) -> Response { Response { id, result: Some(serde_json::to_value(result).unwrap()), error: None } } pub fn new_err(id: RequestId, code: i32, message: String) -> Response { @@ -206,7 +207,7 @@ impl Response { } impl Request { - pub fn new<P: Serialize>(id: RequestId, method: String, params: P) -> Request { + pub fn new<P: serde::Serialize>(id: RequestId, method: String, params: P) -> Request { Request { id, method, params: serde_json::to_value(params).unwrap() } } pub fn extract<P: DeserializeOwned>( @@ -231,7 +232,7 @@ impl Request { } impl Notification { - pub fn new(method: String, params: impl Serialize) -> Notification { + pub fn new(method: String, params: impl serde::Serialize) -> Notification { Notification { method, params: serde_json::to_value(params).unwrap() } } pub fn extract<P: DeserializeOwned>( diff --git a/src/tools/rust-analyzer/lib/lsp-server/src/req_queue.rs b/src/tools/rust-analyzer/lib/lsp-server/src/req_queue.rs index 347a9fb6fb9..c216864bee8 100644 --- a/src/tools/rust-analyzer/lib/lsp-server/src/req_queue.rs +++ b/src/tools/rust-analyzer/lib/lsp-server/src/req_queue.rs @@ -1,7 +1,5 @@ use std::collections::HashMap; -use serde::Serialize; - use crate::{ErrorCode, Request, RequestId, Response, ResponseError}; /// Manages the set of pending requests, both incoming and outgoing. @@ -56,7 +54,7 @@ impl<I> Incoming<I> { } impl<O> Outgoing<O> { - pub fn register<P: Serialize>(&mut self, method: String, params: P, data: O) -> Request { + pub fn register<P: serde::Serialize>(&mut self, method: String, params: P, data: O) -> Request { let id = RequestId::from(self.next_id); self.pending.insert(id.clone(), data); self.next_id += 1; |
