Skip to content

Commit

Permalink
third_party: upgrade rust crates
Browse files Browse the repository at this point in the history
  • Loading branch information
piscisaureus committed Apr 23, 2019
1 parent da64fba commit 6caf865
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 38 deletions.
78 changes: 49 additions & 29 deletions Cargo.lock

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

37 changes: 32 additions & 5 deletions build_extra/rust/BUILD.gn
Expand Up @@ -1110,9 +1110,18 @@ rust_crate("rustyline") {
]
if (is_posix) {
extern += [
":nix",
":utf8parse",

# Override: use nix v0.13.0 instead of v0.11.0.
":nix",
]
## Override: use nix v0.13.0 instead of v0.11.0.
# extern_version = [
# {
# crate_name = "nix"
# crate_version = "0.11.0"
# },
# ]
}
if (is_win) {
extern += [ ":winapi" ]
Expand Down Expand Up @@ -1336,7 +1345,7 @@ rust_crate("time") {

rust_crate("tokio") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-0.1.18/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-0.1.19/src/lib.rs"
features = [
"bytes",
"codec",
Expand Down Expand Up @@ -1533,7 +1542,7 @@ rust_crate("tokio_rustls") {

rust_crate("tokio_sync") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-sync-0.1.4/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-sync-0.1.5/src/lib.rs"
extern = [
":fnv",
":futures",
Expand Down Expand Up @@ -1563,7 +1572,7 @@ rust_crate("tokio_tcp") {

rust_crate("tokio_threadpool") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-threadpool-0.1.13/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-threadpool-0.1.14/src/lib.rs"
extern = [
":crossbeam_deque",
":crossbeam_queue",
Expand Down Expand Up @@ -1843,7 +1852,7 @@ if (is_posix) {

rust_crate("nix") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/nix-0.11.0/src/lib.rs"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/nix-0.13.0/src/lib.rs"
extern = [
":bitflags",
":cfg_if",
Expand Down Expand Up @@ -1930,6 +1939,24 @@ if (is_posix) {
"allow",
]
}

## Override: use nix v0.13.0 instead.
# rust_crate("nix-0.11.0") {
# crate_name = "nix"
# crate_version = "0.11.0"
# edition = "2015"
# source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/nix-0.11.0/src/lib.rs"
# extern = [
# ":bitflags",
# ":cfg_if",
# ":libc",
# ":void",
# ]
# args = [
# "--cap-lints",
# "allow",
# ]
# }
}

if (is_win) {
Expand Down
6 changes: 3 additions & 3 deletions cli/Cargo.toml
Expand Up @@ -39,17 +39,17 @@ rustyline = "3.0.0"
serde_json = "1.0.39"
source-map-mappings = "0.5.0"
tempfile = "3.0.7"
tokio = "0.1.18"
tokio = "0.1.19"
tokio-executor = "0.1.7"
tokio-fs = "0.1.6"
tokio-io = "0.1.12"
tokio-process = "0.2.3"
tokio-rustls = "0.9.2"
tokio-threadpool = "0.1.13"
tokio-threadpool = "0.1.14"
url = "1.7.2"

[target.'cfg(windows)'.dependencies]
winapi = "0.3.7"

[target.'cfg(unix)'.dependencies]
nix = "0.11.0"
nix = "0.13.0"
2 changes: 1 addition & 1 deletion third_party
Submodule third_party updated 362 files

0 comments on commit 6caf865

Please sign in to comment.