diff options
| -rw-r--r-- | Cargo.lock | 13 | ||||
| -rw-r--r-- | build_extra/rust/BUILD.gn | 95 | ||||
| -rw-r--r-- | cli/BUILD.gn | 6 | ||||
| -rw-r--r-- | cli/Cargo.toml | 2 | ||||
| m--------- | third_party | 0 |
5 files changed, 116 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock index 7f96644e6..847205af9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,6 +231,8 @@ dependencies = [ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustyline 4.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "source-map-mappings 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -914,6 +916,16 @@ version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "serde_derive" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] name = "serde_json" version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1550,6 +1562,7 @@ dependencies = [ "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum serde 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd" +"checksum serde_derive 1.0.91 (registry+https://github.com/rust-lang/crates.io-index)" = "101b495b109a3e3ca8c4cbe44cf62391527cdfb6ba15821c5ce80bcd5ea23f9f" "checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d" "checksum signal-hook 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "72ab58f1fda436857e6337dcb6a5aaa34f16c5ddc87b3a8b6ef7a212f90b9c5a" "checksum signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cded4ffa32146722ec54ab1f16320568465aa922aa9ab4708129599740da85d7" diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn index 552c1f553..610fb3cb2 100644 --- a/build_extra/rust/BUILD.gn +++ b/build_extra/rust/BUILD.gn @@ -747,6 +747,42 @@ rust_rlib("percent_encoding") { ] } +rust_rlib("proc_macro2") { + edition = "2015" + source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/proc-macro2-0.4.30/src/lib.rs" + features = [ + "default", + "proc-macro", + ] + extern_rlib = [ "unicode_xid" ] + args = [ + "--cap-lints", + "allow", + ] + + # Added by custom-build script. + cfg = [ + "u128", + "use_proc_macro", + "wrap_proc_macro", + ] +} + +rust_rlib("quote") { + edition = "2015" + source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/quote-0.6.12/src/lib.rs" + features = [ + "default", + "proc-macro", + "proc-macro2", + ] + extern_rlib = [ "proc_macro2" ] + args = [ + "--cap-lints", + "allow", + ] +} + rust_rlib("rand") { edition = "2015" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand-0.6.5/src/lib.rs" @@ -1221,6 +1257,21 @@ rust_rlib("serde") { ] } +rust_proc_macro("serde_derive") { + edition = "2015" + source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde_derive-1.0.91/src/lib.rs" + features = [ "default" ] + extern_rlib = [ + "proc_macro2", + "quote", + "syn", + ] + args = [ + "--cap-lints", + "allow", + ] +} + rust_rlib("serde_json") { edition = "2015" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde_json-1.0.39/src/lib.rs" @@ -1324,6 +1375,40 @@ rust_rlib("strsim") { ] } +rust_rlib("syn") { + edition = "2015" + source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/syn-0.15.34/src/lib.rs" + features = [ + "clone-impls", + "default", + "derive", + "extra-traits", + "parsing", + "printing", + "proc-macro", + "proc-macro2", + "quote", + "visit", + ] + extern_rlib = [ + "proc_macro2", + "quote", + "unicode_xid", + ] + args = [ + "--cap-lints", + "allow", + ] + + # Added by custom-build script. + cfg = [ + "syn_can_call_macro_by_path", + "syn_can_use_associated_constants", + "syn_can_use_thread_id", + "syn_disable_nightly_tests", + ] +} + rust_rlib("tempfile") { edition = "2015" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tempfile-3.0.7/src/lib.rs" @@ -1745,6 +1830,16 @@ rust_rlib("unicode_width") { ] } +rust_rlib("unicode_xid") { + edition = "2015" + source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-xid-0.1.0/src/lib.rs" + features = [ "default" ] + args = [ + "--cap-lints", + "allow", + ] +} + rust_rlib("untrusted") { edition = "2015" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/untrusted-0.6.2/src/untrusted.rs" diff --git a/cli/BUILD.gn b/cli/BUILD.gn index 63c5266b6..049553c48 100644 --- a/cli/BUILD.gn +++ b/cli/BUILD.gn @@ -13,6 +13,11 @@ main_extern = [ crate_name = "deno" crate_type = "rlib" }, + { + label = "$rust_build:serde_derive" + crate_name = "serde_derive" + crate_type = "proc_macro" + }, ] main_extern_rlib = [ "ansi_term", @@ -32,6 +37,7 @@ main_extern_rlib = [ "remove_dir_all", "ring", "rustyline", + "serde", "serde_json", "source_map_mappings", "tempfile", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index aa2605d30..8d38a456b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -36,6 +36,8 @@ regex = "1.1.6" remove_dir_all = "0.5.1" ring = "0.14.6" rustyline = "4.0.0" +serde = "1.0.91" +serde_derive = "1.0.91" serde_json = "1.0.39" source-map-mappings = "0.5.0" tempfile = "3.0.7" diff --git a/third_party b/third_party -Subproject 1815468acc16b4461a7ca573887ff94c79be791 +Subproject d6515fbb3de70bee06ef9dc602ea59fdfcf0186 |