Replaced fold with for loop

[rust.git] / crates / rust-analyzer / src / lib.rs

diff --git a/crates/rust-analyzer/src/lib.rs b/crates/rust-analyzer/src/lib.rs
index d9a5030a0fd46ae94841a3587ec3e197b0ab1d75..d29ec512d6193ecbf9d70bfe6c6502d2fa6edc20 100644 (file)
--- a/crates/rust-analyzer/src/lib.rs
+++ b/crates/rust-analyzer/src/lib.rs
@@ -30,28 +30,28 @@ macro_rules! eprintln {
 mod markdown;
 mod diagnostics;
 mod line_index;
-mod request_metrics;
 mod lsp_utils;
 mod thread_pool;
-mod document;
+mod mem_docs;
 mod diff;
 mod op_queue;
 pub mod lsp_ext;
 pub mod config;
 
 #[cfg(test)]
-mod benchmarks;
+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<dyn std::error::Error + Send + Sync>;
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 pub fn from_json<T: DeserializeOwned>(what: &'static str, json: serde_json::Value) -> Result<T> {
-    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)
 }