diff --git a/Cargo.lock b/Cargo.lock index 9d95151da9..d7d0832bb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1315,7 +1315,6 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "serde_path_to_error", "sourcegen", "stdx", "syntax", @@ -1453,15 +1452,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f6109f0506e20f7e0f910e51a0079acf41da8e0694e6442527c4ddf5a2b158" -dependencies = [ - "serde", -] - [[package]] name = "serde_repr" version = "0.1.7" diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 8a18d5801a..b835500561 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -31,7 +31,6 @@ oorandom = "11.1.2" rustc-hash = "1.1.0" serde = { version = "1.0.106", features = ["derive"] } serde_json = { version = "1.0.48", features = ["preserve_order"] } -serde_path_to_error = "0.1" threadpool = "1.7.1" rayon = "1.5" mimalloc = { version = "0.1.19", default-features = false, optional = true } diff --git a/crates/rust-analyzer/src/lib.rs b/crates/rust-analyzer/src/lib.rs index c8c996f0da..d29ec512d6 100644 --- a/crates/rust-analyzer/src/lib.rs +++ b/crates/rust-analyzer/src/lib.rs @@ -41,16 +41,17 @@ pub mod config; #[cfg(test)] mod integrated_benchmarks; -use serde::de::DeserializeOwned; use std::fmt; +use serde::de::DeserializeOwned; + pub use crate::{caps::server_capabilities, main_loop::main_loop}; pub type Error = Box; pub type Result = std::result::Result; pub fn from_json(what: &'static str, json: serde_json::Value) -> Result { - let res = serde_path_to_error::deserialize(&json) + let res = serde_json::from_value(json.clone()) .map_err(|e| format!("Failed to deserialize {}: {}; {}", what, e, json))?; Ok(res) }