Use flatbuffers from crates.io (#1400)

This commit is contained in:
Ryan Dahl 2018-12-23 12:39:40 -05:00 committed by GitHub
parent 6cc998f28b
commit 63d558da0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 13 deletions

View File

@ -20,11 +20,13 @@ group("default") {
main_extern = [
"$rust_build:atty",
"$rust_build:dirs",
"$rust_build:flatbuffers",
"$rust_build:futures",
"$rust_build:getopts",
"$rust_build:http",
"$rust_build:hyper",
"$rust_build:hyper_rustls",
"$rust_build:kernel32",
"$rust_build:lazy_static",
"$rust_build:libc",
"$rust_build:log",
@ -42,9 +44,7 @@ main_extern = [
"$rust_build:tokio_process",
"$rust_build:tokio_threadpool",
"$rust_build:url",
"$rust_build:kernel32",
"$rust_build:winapi",
"//build_extra/flatbuffers/rust:flatbuffers",
]
ts_sources = [

4
Cargo.lock generated
View File

@ -155,7 +155,7 @@ version = "0.2.3"
dependencies = [
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"flatbuffers 0.5.0",
"flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
"getopts 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
"http 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@ -215,6 +215,7 @@ dependencies = [
[[package]]
name = "flatbuffers"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1273,6 +1274,7 @@ dependencies = [
"checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a"
"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7"
"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596"
"checksum flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea0c34f669be9911826facafe996adfda978aeee67285a13556869e2d8b8331f"
"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"

View File

@ -11,19 +11,20 @@ version = "0.2.3"
[dependencies]
atty = "=0.2.11"
dirs = "=1.0.4"
flatbuffers = { path = "third_party/flatbuffers/rust/flatbuffers/" }
flatbuffers = "=0.5.0"
futures = "=0.1.25"
getopts = "=0.2.18"
http = "=0.1.13"
hyper = "=0.12.16"
hyper-rustls = "=0.15.0"
kernel32-sys = "=0.2.2"
lazy_static = "=1.2.0"
libc = "=0.2.44"
log = "=0.4.6"
rand = "=0.6.1"
remove_dir_all = "=0.5.1"
rustyline = "=2.1.0"
ring = "=0.13.5"
rustyline = "=2.1.0"
serde_json = "1.0.33"
source-map-mappings = "0.5.0"
tempfile = "=3.0.5"
@ -34,5 +35,4 @@ tokio-io = "=0.1.10"
tokio-process = "=0.2.3"
tokio-threadpool = "=0.1.9"
url = "=1.7.1"
kernel32-sys = "=0.2.2"
winapi = "=0.3.6"

View File

@ -1,6 +0,0 @@
import("//build_extra/rust/rust.gni")
rust_crate("flatbuffers") {
source_root = "//third_party/flatbuffers/rust/flatbuffers/src/lib.rs"
extern = [ "//build_extra/rust:smallvec" ]
}

View File

@ -11,6 +11,11 @@ import("rust.gni")
crates = "//third_party/rust_crates"
registry_github = "$crates/registry/src/github.com-1ecc6299db9ec823/"
rust_crate("flatbuffers") {
source_root = "$registry_github/flatbuffers-0.5.0/src/lib.rs"
extern = [ ":smallvec" ]
}
rust_crate("nix") {
source_root = "$registry_github/nix-0.11.0/src/lib.rs"
extern = [

@ -1 +1 @@
Subproject commit 7d8c9aa769778140e1619f545e706bf34545509e
Subproject commit f5583353dcef518fc4881e6b2329e8b601ccd042