summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Belder <bertbelder@gmail.com>2019-08-22 17:27:51 -0700
committerBert Belder <bertbelder@gmail.com>2019-08-22 17:27:51 -0700
commit47c216317f8eb5bf277663a732a79f6b07ba79ef (patch)
treea0d4b36c8f94836aff8dde2fa050878507f0fb9c
parent0809b06a3938868f364f1343b0de4d5d9686495d (diff)
build: enable 'derive' feature of 'serde' crate
-rw-r--r--Cargo.lock3
-rw-r--r--build_extra/rust/BUILD.gn9
-rw-r--r--cli/Cargo.toml2
3 files changed, 13 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock
index f785728b2..3fbcb616c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1021,6 +1021,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "serde"
version = "1.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "serde_derive"
diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn
index 404bb913c..80f2d8c85 100644
--- a/build_extra/rust/BUILD.gn
+++ b/build_extra/rust/BUILD.gn
@@ -1153,8 +1153,17 @@ rust_rlib("serde") {
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde-1.0.99/src/lib.rs"
features = [
"default",
+ "derive",
+ "serde_derive",
"std",
]
+ extern = [
+ {
+ label = ":serde_derive"
+ crate_type = "proc_macro"
+ crate_name = "serde_derive"
+ },
+ ]
# Added by custom-build script.
cfg = [
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 541a74f32..cc2286af5 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -37,7 +37,7 @@ regex = "1.2.1"
remove_dir_all = "0.5.2"
ring = "~0.14.6"
rustyline = "5.0.2"
-serde = "1.0.99"
+serde = { version = "1.0.99", features = ["derive"] }
serde_derive = "1.0.99"
serde_json = { version = "1.0.40", features = [ "preserve_order" ] }
source-map-mappings = "0.5.0"