Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-26 11:55:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove explicit serde_derive

Browse source
This commit is contained in:
Aleksey Kladov 2018-12-21 22:39:59 +03:00
parent 67ac0a423f
commit 2351308d92
6 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -334,7 +334,6 @@ dependencies = [
"languageserver-types 0.53.0 (registry+https://github.com/rust-lang/crates.io-index)", "languageserver-types 0.53.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -732,7 +731,6 @@ dependencies = [
"relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "smol_str 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",

1
crates/gen_lsp_server/Cargo.toml
View file

@ -13,5 +13,4 @@ log = "0.4.3"
failure = "0.1.2" failure = "0.1.2"
serde_json = "1.0.24" serde_json = "1.0.24"
serde = "1.0.71" serde = "1.0.71"
serde_derive = "1.0.71"
crossbeam-channel = "0.2.4" crossbeam-channel = "0.2.4"

2
crates/gen_lsp_server/src/msg.rs
View file

@ -1,7 +1,7 @@
use std::io::{BufRead, Write}; use std::io::{BufRead, Write};
use languageserver_types::{notification::Notification, request::Request}; use languageserver_types::{notification::Notification, request::Request};
use serde_derive::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::{from_str, from_value, to_string, to_value, Value}; use serde_json::{from_str, from_value, to_string, to_value, Value};
use failure::{bail, format_err}; use failure::{bail, format_err};

1
crates/ra_lsp_server/Cargo.toml
View file

@ -12,7 +12,6 @@ failure = "0.1.2"
failure_derive = "0.1.2" failure_derive = "0.1.2"
serde_json = "1.0.24" serde_json = "1.0.24"
serde = "1.0.71" serde = "1.0.71"
serde_derive = "1.0.71"
drop_bomb = "0.1.0" drop_bomb = "0.1.0"
crossbeam-channel = "0.2.4" crossbeam-channel = "0.2.4"
flexi_logger = "0.10.0" flexi_logger = "0.10.0"

4
crates/ra_lsp_server/src/main.rs
View file

@ -1,7 +1,7 @@
use serde_derive::Deserialize; use serde::Deserialize;
use serde::Deserialize as _D;
use flexi_logger::{Duplicate, Logger}; use flexi_logger::{Duplicate, Logger};
use gen_lsp_server::{run_server, stdio_transport}; use gen_lsp_server::{run_server, stdio_transport};
use ra_lsp_server::Result; use ra_lsp_server::Result;
fn main() -> Result<()> { fn main() -> Result<()> {

2
crates/ra_lsp_server/src/req.rs
View file

@ -1,4 +1,4 @@
use serde_derive::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use languageserver_types::{Location, Position, Range, TextDocumentIdentifier, Url}; use languageserver_types::{Location, Position, Range, TextDocumentIdentifier, Url};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use url_serde; use url_serde;