diff --git a/BUILD.gn b/BUILD.gn index e007840f65..9f2f8868d6 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -37,6 +37,8 @@ config("deno_config") { main_extern = [ "$rust_build:libc", "$rust_build:log", + "$rust_build:sha1", + "$rust_build:tempfile", "$rust_build:url", "//build_extra/flatbuffers/rust:flatbuffers", ":msg_rs", @@ -52,6 +54,9 @@ main_extern = [ "$rust_build:percent_encoding", "$rust_build:unicode_bidi", "$rust_build:unicode_normalization", + "$rust_build:rand", + "$rust_build:rand_core", + "$rust_build:remove_dir_all", ] rust_executable("deno") { diff --git a/Cargo.lock b/Cargo.lock deleted file mode 100644 index 646a36e710..0000000000 --- a/Cargo.lock +++ /dev/null @@ -1,80 +0,0 @@ -[[package]] -name = "cfg-if" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "deno" -version = "0.0.0" -dependencies = [ - "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "libc" -version = "0.2.42" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "log" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "matches" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "url" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[metadata] -"checksum cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efe5c877e17a9c717a0bf3613b2709f723202c4e4675cc8f12926ded29bcb17e" -"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -"checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1" -"checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2" -"checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" -"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25" -"checksum url 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2a321979c09843d272956e73700d12c4e7d3d92b2ee112b31548aef0d4efc5a6" diff --git a/Cargo.toml b/Cargo.toml index afb81d744f..0208bf2385 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,3 +9,5 @@ version = "0.0.0" url = "1.7.1" libc = "0.2.42" log = "0.4.3" +sha1 = "0.6.0" +tempfile = "3" diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn index b94cfe372f..f5f0b9bb60 100644 --- a/build_extra/rust/BUILD.gn +++ b/build_extra/rust/BUILD.gn @@ -69,3 +69,41 @@ rust_component("cfg_if") { source_root = "$crates/registry/src/github.com-1ecc6299db9ec823/cfg-if-0.1.4/src/lib.rs" } + +rust_component("sha1") { + source_root = + "$crates/registry/src/github.com-1ecc6299db9ec823/sha1-0.6.0/src/lib.rs" +} + +rust_component("tempfile") { + source_root = "$crates/registry/src/github.com-1ecc6299db9ec823/tempfile-3.0.3/src/lib.rs" + extern = [ + ":libc", + ":rand", + ":remove_dir_all", + ] +} + +rust_component("rand") { + source_root = + "$crates/registry/src/github.com-1ecc6299db9ec823/rand-0.5.4/src/lib.rs" + extern = [ + ":libc", + ":rand_core", + ] + cfg = [ + "feature=\"std\"", + "feature=\"alloc\"", + ] + if (is_mac) { + libs = [ "Security.framework" ] + } +} + +rust_component("rand_core") { + source_root = "$crates/registry/src/github.com-1ecc6299db9ec823/rand_core-0.2.1/src/lib.rs" +} + +rust_component("remove_dir_all") { + source_root = "$crates/registry/src/github.com-1ecc6299db9ec823/remove_dir_all-0.5.1/src/lib.rs" +} diff --git a/src/main.rs b/src/main.rs index 38ba654b95..a12f95018d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,6 +3,8 @@ extern crate libc; extern crate log; extern crate flatbuffers; extern crate msg_rs as msg_generated; +extern crate sha1; +extern crate tempfile; extern crate url; use libc::c_int; diff --git a/third_party b/third_party index 8967dcf1d9..429da4dac5 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit 8967dcf1d9b936c40f799910c0e5696f1f5bad6d +Subproject commit 429da4dac5865386d5410f084a68e4cd71a94bc8