Skip to content

Commit

Permalink
Use flatbuffers from crates.io (denoland#1400)
Browse files Browse the repository at this point in the history
  • Loading branch information
ry committed Dec 23, 2018
1 parent 6cc998f commit 63d558d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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 = [
Expand Down
4 changes: 3 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
6 changes: 0 additions & 6 deletions build_extra/flatbuffers/rust/BUILD.gn

This file was deleted.

5 changes: 5 additions & 0 deletions build_extra/rust/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down

0 comments on commit 63d558d

Please sign in to comment.