diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-07 17:23:59 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-07 17:23:59 +0000 |
commit | f8f24cb869cd5755d3de77ed3782741761f99e18 (patch) | |
tree | 51e5ea9bc282ab6552ba8bfa6bc8e91810406715 | |
parent | 711b82a7019bfc7be95b05afe022e6c9a6c08e64 (diff) | |
parent | d4108cdd609e56137d67c4af07825f664ac3ffc3 (diff) |
Merge #949
949: Specify derive feature for serde r=matklad a=pcpthm
`ra_project_model` build will fail when no dependencies are using this feature. Reproduced by creating a crate depending on `ra_batch`.
Co-authored-by: pcpthm <[email protected]>
-rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_project_model/Cargo.toml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index a36e6b5ae..2b3890e01 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
@@ -10,7 +10,7 @@ relative-path = "0.4.0" | |||
10 | failure = "0.1.4" | 10 | failure = "0.1.4" |
11 | failure_derive = "0.1.4" | 11 | failure_derive = "0.1.4" |
12 | serde_json = "1.0.34" | 12 | serde_json = "1.0.34" |
13 | serde = "1.0.83" | 13 | serde = { version = "1.0.83", features = ["derive"] } |
14 | crossbeam-channel = "0.3.5" | 14 | crossbeam-channel = "0.3.5" |
15 | flexi_logger = "0.11.0" | 15 | flexi_logger = "0.11.0" |
16 | log = "0.4.3" | 16 | log = "0.4.3" |
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml index 487cdfaf1..34d33531e 100644 --- a/crates/ra_project_model/Cargo.toml +++ b/crates/ra_project_model/Cargo.toml | |||
@@ -17,7 +17,7 @@ cargo_metadata = "0.7.0" | |||
17 | ra_arena = { path = "../ra_arena" } | 17 | ra_arena = { path = "../ra_arena" } |
18 | ra_db = { path = "../ra_db" } | 18 | ra_db = { path = "../ra_db" } |
19 | 19 | ||
20 | serde = "1.0.89" | 20 | serde = { version = "1.0.89", features = ["derive"] } |
21 | serde_json = "1.0.39" | 21 | serde_json = "1.0.39" |
22 | 22 | ||
23 | [dev-dependencies] | 23 | [dev-dependencies] |