Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Upgrade Serde to 1.0 #300

Merged
merged 1 commit into from
May 10, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 33 additions & 80 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -7,17 +7,17 @@ authors = ["Jonathan Turner <jturner@mozilla.com>"]
cargo = { git = "https://github.com/rust-lang/cargo" }
derive-new = "0.3"
env_logger = "0.4"
languageserver-types = "0.7.0"
languageserver-types = "0.8.0"
log = "0.3"
racer = "2.0.6"
rls-analysis = "0.1"
rls-data = "0.1"
rls-span = { version = "0.1", features = ["serialize-serde"] }
rls-vfs = { version = "0.2", features = ["racer-impls"] }
rls-analysis = "0.2.1"
rls-data = "0.3.1"
rls-span = { version = "0.4", features = ["serialize-serde"] }
rls-vfs = { version = "0.3", features = ["racer-impls"] }
rustfmt = { git = "https://github.com/rust-lang-nursery/rustfmt" }
serde = "0.9"
serde_json = "0.9"
serde_derive = "0.9"
toml = "0.3"
serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
toml = "0.4"
url = "1.1.0"
url_serde = "0.1.0"
url_serde = "0.2.0"
12 changes: 9 additions & 3 deletions src/cmd.rs
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ use build::BuildQueue;
use vfs::Vfs;
use server::{self, ServerMessage, Request, Notification, Method, LsService, ParseError, ResponseData};

use ls_types::{TextDocumentPositionParams, TextDocumentIdentifier, Position, InitializeParams};
use ls_types::{ClientCapabilities, TextDocumentPositionParams, TextDocumentIdentifier, TraceOption, Position, InitializeParams};
use serde_json::Value;
use std::time::Duration;
use std::io::{stdin, stdout, Write};
@@ -115,9 +115,15 @@ fn exit() -> ServerMessage {
fn initialize(root_path: String) -> ServerMessage {
let params = InitializeParams {
process_id: None,
root_path: Some(root_path),
root_path: Some(root_path), // FIXME(#299): This property is deprecated. Instead Use `root_uri`.
root_uri: None,
initialization_options: None,
capabilities: Value::Null,
capabilities: ClientCapabilities {
workspace: None,
text_document: None,
experimental: Value::Null,
},
trace: TraceOption::Off,
};
let request = Request {
id: next_id(),
Loading