foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-03 04:48:52 -05:00
Code Issues Packages 1 Wiki Activity

Update to rust 2018 edition

Browse source
This commit is contained in:
Andy Hayden 2019-01-13 22:30:38 -08:00 committed by Bert Belder
parent 7d08db2191
commit 526fdac053
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461
22 changed files with 287 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -7,6 +7,7 @@
[package] [package]
name = "deno" name = "deno"
version = "0.2.6" version = "0.2.6"
edition = "2018"
[dependencies] [dependencies]
atty = "0.2.11" atty = "0.2.11"

111
build_extra/rust/BUILD.gn
View file

@ -11,6 +11,7 @@ import("rust.gni")
cargo_home = "//third_party/rust_crates" cargo_home = "//third_party/rust_crates"
rust_crate("arrayvec") { rust_crate("arrayvec") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/arrayvec-0.4.10/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/arrayvec-0.4.10/src/lib.rs"
extern = [ ":nodrop" ] extern = [ ":nodrop" ]
args = [ args = [
@ -20,6 +21,7 @@ rust_crate("arrayvec") {
} }
rust_crate("atty") { rust_crate("atty") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/atty-0.2.11/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/atty-0.2.11/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -34,6 +36,7 @@ rust_crate("atty") {
} }
rust_crate("base64") { rust_crate("base64") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/base64-0.9.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/base64-0.9.3/src/lib.rs"
extern = [ extern = [
":byteorder", ":byteorder",
@ -46,6 +49,7 @@ rust_crate("base64") {
} }
rust_crate("byteorder") { rust_crate("byteorder") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/byteorder-1.2.7/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/byteorder-1.2.7/src/lib.rs"
features = [ features = [
"default", "default",
@ -58,6 +62,7 @@ rust_crate("byteorder") {
} }
rust_crate("bytes") { rust_crate("bytes") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/bytes-0.4.11/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/bytes-0.4.11/src/lib.rs"
extern = [ extern = [
":byteorder", ":byteorder",
@ -70,6 +75,7 @@ rust_crate("bytes") {
} }
rust_crate("cfg_if") { rust_crate("cfg_if") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/cfg-if-0.1.6/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/cfg-if-0.1.6/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -78,6 +84,7 @@ rust_crate("cfg_if") {
} }
rust_crate("crossbeam_channel") { rust_crate("crossbeam_channel") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-channel-0.3.6/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-channel-0.3.6/src/lib.rs"
extern = [ extern = [
":crossbeam_utils", ":crossbeam_utils",
@ -92,6 +99,7 @@ rust_crate("crossbeam_channel") {
} }
rust_crate("crossbeam_deque") { rust_crate("crossbeam_deque") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-deque-0.6.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-deque-0.6.3/src/lib.rs"
extern = [ extern = [
":crossbeam_epoch", ":crossbeam_epoch",
@ -104,6 +112,7 @@ rust_crate("crossbeam_deque") {
} }
rust_crate("crossbeam_epoch") { rust_crate("crossbeam_epoch") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-epoch-0.7.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-epoch-0.7.0/src/lib.rs"
features = [ features = [
"crossbeam-utils", "crossbeam-utils",
@ -126,6 +135,7 @@ rust_crate("crossbeam_epoch") {
} }
rust_crate("crossbeam_utils") { rust_crate("crossbeam_utils") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-utils-0.6.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/crossbeam-utils-0.6.3/src/lib.rs"
features = [ features = [
"default", "default",
@ -139,6 +149,7 @@ rust_crate("crossbeam_utils") {
} }
rust_crate("ct_logs") { rust_crate("ct_logs") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ct-logs-0.4.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ct-logs-0.4.0/src/lib.rs"
extern = [ ":sct" ] extern = [ ":sct" ]
args = [ args = [
@ -148,6 +159,7 @@ rust_crate("ct_logs") {
} }
rust_crate("dirs") { rust_crate("dirs") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/dirs-1.0.4/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/dirs-1.0.4/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -162,6 +174,7 @@ rust_crate("dirs") {
} }
rust_crate("flatbuffers") { rust_crate("flatbuffers") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/flatbuffers-0.5.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/flatbuffers-0.5.0/src/lib.rs"
extern = [ ":smallvec" ] extern = [ ":smallvec" ]
args = [ args = [
@ -171,6 +184,7 @@ rust_crate("flatbuffers") {
} }
rust_crate("fnv") { rust_crate("fnv") {
edition = "2015"
source_root = source_root =
"$cargo_home/registry/src/github.com-1ecc6299db9ec823/fnv-1.0.6/lib.rs" "$cargo_home/registry/src/github.com-1ecc6299db9ec823/fnv-1.0.6/lib.rs"
args = [ args = [
@ -180,6 +194,7 @@ rust_crate("fnv") {
} }
rust_crate("futures") { rust_crate("futures") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/futures-0.1.25/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/futures-0.1.25/src/lib.rs"
features = [ features = [
"default", "default",
@ -193,6 +208,7 @@ rust_crate("futures") {
} }
rust_crate("futures_cpupool") { rust_crate("futures_cpupool") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/futures-cpupool-0.1.8/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/futures-cpupool-0.1.8/src/lib.rs"
features = [ features = [
"default", "default",
@ -210,6 +226,7 @@ rust_crate("futures_cpupool") {
} }
rust_crate("getopts") { rust_crate("getopts") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/getopts-0.2.18/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/getopts-0.2.18/src/lib.rs"
extern = [ ":unicode_width" ] extern = [ ":unicode_width" ]
args = [ args = [
@ -219,6 +236,7 @@ rust_crate("getopts") {
} }
rust_crate("h2") { rust_crate("h2") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/h2-0.1.15/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/h2-0.1.15/src/lib.rs"
extern = [ extern = [
":byteorder", ":byteorder",
@ -239,6 +257,7 @@ rust_crate("h2") {
} }
rust_crate("http") { rust_crate("http") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/http-0.1.14/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/http-0.1.14/src/lib.rs"
extern = [ extern = [
":bytes", ":bytes",
@ -252,6 +271,7 @@ rust_crate("http") {
} }
rust_crate("httparse") { rust_crate("httparse") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/httparse-1.3.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/httparse-1.3.3/src/lib.rs"
features = [ features = [
"default", "default",
@ -267,6 +287,7 @@ rust_crate("httparse") {
} }
rust_crate("hyper") { rust_crate("hyper") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-0.12.20/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-0.12.20/src/lib.rs"
features = [ features = [
"__internal_flaky_tests", "__internal_flaky_tests",
@ -309,6 +330,7 @@ rust_crate("hyper") {
} }
rust_crate("hyper_rustls") { rust_crate("hyper_rustls") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-rustls-0.15.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/hyper-rustls-0.15.0/src/lib.rs"
extern = [ extern = [
":ct_logs", ":ct_logs",
@ -329,6 +351,7 @@ rust_crate("hyper_rustls") {
} }
rust_crate("idna") { rust_crate("idna") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/idna-0.1.5/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/idna-0.1.5/src/lib.rs"
extern = [ extern = [
":matches", ":matches",
@ -342,6 +365,7 @@ rust_crate("idna") {
} }
rust_crate("indexmap") { rust_crate("indexmap") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/indexmap-1.0.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/indexmap-1.0.2/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -350,6 +374,7 @@ rust_crate("indexmap") {
} }
rust_crate("iovec") { rust_crate("iovec") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/iovec-0.1.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/iovec-0.1.2/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -369,6 +394,7 @@ rust_crate("iovec") {
} }
rust_crate("itoa") { rust_crate("itoa") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/itoa-0.4.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/itoa-0.4.3/src/lib.rs"
features = [ features = [
"default", "default",
@ -381,6 +407,7 @@ rust_crate("itoa") {
} }
rust_crate("lazy_static") { rust_crate("lazy_static") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lazy_static-1.2.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lazy_static-1.2.0/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -389,6 +416,7 @@ rust_crate("lazy_static") {
} }
rust_crate("lazycell") { rust_crate("lazycell") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lazycell-1.2.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lazycell-1.2.1/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -397,6 +425,7 @@ rust_crate("lazycell") {
} }
rust_crate("libc") { rust_crate("libc") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/libc-0.2.46/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/libc-0.2.46/src/lib.rs"
features = [ features = [
"default", "default",
@ -412,6 +441,7 @@ rust_crate("libc") {
} }
rust_crate("lock_api") { rust_crate("lock_api") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lock_api-0.1.5/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/lock_api-0.1.5/src/lib.rs"
extern = [ extern = [
":scopeguard", ":scopeguard",
@ -428,6 +458,7 @@ rust_crate("lock_api") {
} }
rust_crate("log") { rust_crate("log") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/log-0.4.6/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/log-0.4.6/src/lib.rs"
extern = [ ":cfg_if" ] extern = [ ":cfg_if" ]
args = [ args = [
@ -437,6 +468,7 @@ rust_crate("log") {
} }
rust_crate("matches") { rust_crate("matches") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/matches-0.1.8/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/matches-0.1.8/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -445,6 +477,7 @@ rust_crate("matches") {
} }
rust_crate("memchr") { rust_crate("memchr") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/memchr-2.1.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/memchr-2.1.2/src/lib.rs"
features = [ features = [
"default", "default",
@ -470,6 +503,7 @@ rust_crate("memchr") {
} }
rust_crate("memoffset") { rust_crate("memoffset") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/memoffset-0.2.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/memoffset-0.2.1/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -478,6 +512,7 @@ rust_crate("memoffset") {
} }
rust_crate("mio") { rust_crate("mio") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-0.6.16/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-0.6.16/src/lib.rs"
features = [ features = [
"default", "default",
@ -513,6 +548,7 @@ rust_crate("mio") {
} }
rust_crate("net2") { rust_crate("net2") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/net2-0.2.33/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/net2-0.2.33/src/lib.rs"
features = [ features = [
"default", "default",
@ -532,6 +568,7 @@ rust_crate("net2") {
} }
rust_crate("nodrop") { rust_crate("nodrop") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/nodrop-0.1.13/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/nodrop-0.1.13/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -540,6 +577,7 @@ rust_crate("nodrop") {
} }
rust_crate("num_cpus") { rust_crate("num_cpus") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/num_cpus-1.9.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/num_cpus-1.9.0/src/lib.rs"
extern = [ ":libc" ] extern = [ ":libc" ]
args = [ args = [
@ -550,6 +588,7 @@ rust_crate("num_cpus") {
## Override: avoid dependency on on 'owning_ref'. ## Override: avoid dependency on on 'owning_ref'.
# rust_crate("owning_ref") { # rust_crate("owning_ref") {
# edition = "2015"
# source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/owning_ref-0.4.0/src/lib.rs" # source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/owning_ref-0.4.0/src/lib.rs"
# extern = [ ":stable_deref_trait" ] # extern = [ ":stable_deref_trait" ]
# args = [ # args = [
@ -559,6 +598,7 @@ rust_crate("num_cpus") {
# } # }
rust_crate("parking_lot") { rust_crate("parking_lot") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/parking_lot-0.7.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/parking_lot-0.7.1/src/lib.rs"
features = [ features = [
"default", "default",
@ -578,6 +618,7 @@ rust_crate("parking_lot") {
} }
rust_crate("parking_lot_core") { rust_crate("parking_lot_core") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/parking_lot_core-0.4.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/parking_lot_core-0.4.0/src/lib.rs"
extern = [ extern = [
":rand", ":rand",
@ -599,6 +640,7 @@ rust_crate("parking_lot_core") {
} }
rust_crate("percent_encoding") { rust_crate("percent_encoding") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/percent-encoding-1.0.1/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/percent-encoding-1.0.1/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -607,6 +649,7 @@ rust_crate("percent_encoding") {
} }
rust_crate("rand") { rust_crate("rand") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand-0.6.4/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand-0.6.4/src/lib.rs"
features = [ features = [
"alloc", "alloc",
@ -644,6 +687,7 @@ rust_crate("rand") {
} }
rust_crate("rand_chacha") { rust_crate("rand_chacha") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_chacha-0.1.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_chacha-0.1.1/src/lib.rs"
extern = [ ":rand_core" ] extern = [ ":rand_core" ]
args = [ args = [
@ -656,6 +700,7 @@ rust_crate("rand_chacha") {
} }
rust_crate("rand_core") { rust_crate("rand_core") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_core-0.3.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_core-0.3.0/src/lib.rs"
features = [ features = [
"alloc", "alloc",
@ -668,6 +713,7 @@ rust_crate("rand_core") {
} }
rust_crate("rand_hc") { rust_crate("rand_hc") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_hc-0.1.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_hc-0.1.0/src/lib.rs"
extern = [ ":rand_core" ] extern = [ ":rand_core" ]
args = [ args = [
@ -677,6 +723,7 @@ rust_crate("rand_hc") {
} }
rust_crate("rand_isaac") { rust_crate("rand_isaac") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_isaac-0.1.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_isaac-0.1.1/src/lib.rs"
extern = [ ":rand_core" ] extern = [ ":rand_core" ]
args = [ args = [
@ -686,6 +733,7 @@ rust_crate("rand_isaac") {
} }
rust_crate("rand_os") { rust_crate("rand_os") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_os-0.1.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_os-0.1.1/src/lib.rs"
extern = [ ":rand_core" ] extern = [ ":rand_core" ]
args = [ args = [
@ -706,6 +754,7 @@ rust_crate("rand_os") {
} }
rust_crate("rand_pcg") { rust_crate("rand_pcg") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_pcg-0.1.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_pcg-0.1.1/src/lib.rs"
extern = [ ":rand_core" ] extern = [ ":rand_core" ]
args = [ args = [
@ -718,6 +767,7 @@ rust_crate("rand_pcg") {
} }
rust_crate("rand_xorshift") { rust_crate("rand_xorshift") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_xorshift-0.1.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand_xorshift-0.1.1/src/lib.rs"
extern = [ ":rand_core" ] extern = [ ":rand_core" ]
args = [ args = [
@ -727,6 +777,7 @@ rust_crate("rand_xorshift") {
} }
rust_crate("remove_dir_all") { rust_crate("remove_dir_all") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/remove_dir_all-0.5.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/remove_dir_all-0.5.1/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -738,6 +789,7 @@ rust_crate("remove_dir_all") {
} }
rust_crate("ring") { rust_crate("ring") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ring-0.13.5/src/lib.rs"
features = [ features = [
"default", "default",
@ -859,6 +911,7 @@ static_library("ring-core") {
# } # }
rust_crate("rustls") { rust_crate("rustls") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustls-0.14.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rustls-0.14.0/src/lib.rs"
features = [ features = [
"default", "default",
@ -892,8 +945,6 @@ rust_crate("rustyline") {
args = [ args = [
"--cap-lints", "--cap-lints",
"allow", "allow",
"--edition",
"2018",
] ]
if (is_posix) { if (is_posix) {
extern += [ extern += [
@ -907,6 +958,7 @@ rust_crate("rustyline") {
} }
rust_crate("ryu") { rust_crate("ryu") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ryu-0.2.7/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ryu-0.2.7/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -921,6 +973,7 @@ rust_crate("ryu") {
} }
rust_crate("safemem") { rust_crate("safemem") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/safemem-0.3.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/safemem-0.3.0/src/lib.rs"
features = [ features = [
"default", "default",
@ -933,6 +986,7 @@ rust_crate("safemem") {
} }
rust_crate("scopeguard") { rust_crate("scopeguard") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/scopeguard-0.3.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/scopeguard-0.3.3/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -941,6 +995,7 @@ rust_crate("scopeguard") {
} }
rust_crate("sct") { rust_crate("sct") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/sct-0.4.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/sct-0.4.0/src/lib.rs"
extern = [ extern = [
":ring", ":ring",
@ -953,6 +1008,7 @@ rust_crate("sct") {
} }
rust_crate("serde") { rust_crate("serde") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde-1.0.84/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde-1.0.84/src/lib.rs"
features = [ features = [
"default", "default",
@ -975,6 +1031,7 @@ rust_crate("serde") {
} }
rust_crate("serde_json") { rust_crate("serde_json") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde_json-1.0.35/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/serde_json-1.0.35/src/lib.rs"
features = [ "default" ] features = [ "default" ]
extern = [ extern = [
@ -989,6 +1046,7 @@ rust_crate("serde_json") {
} }
rust_crate("slab") { rust_crate("slab") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/slab-0.4.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/slab-0.4.2/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -997,6 +1055,7 @@ rust_crate("slab") {
} }
rust_crate("smallvec") { rust_crate("smallvec") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/smallvec-0.6.7/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/smallvec-0.6.7/lib.rs"
features = [ features = [
"default", "default",
@ -1010,6 +1069,7 @@ rust_crate("smallvec") {
} }
rust_crate("source_map_mappings") { rust_crate("source_map_mappings") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/source-map-mappings-0.5.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/source-map-mappings-0.5.0/src/lib.rs"
extern = [ extern = [
":vlq", ":vlq",
@ -1033,6 +1093,7 @@ rust_crate("source_map_mappings") {
## Override: avoid dependency on on 'owning_ref'. ## Override: avoid dependency on on 'owning_ref'.
# rust_crate("stable_deref_trait") { # rust_crate("stable_deref_trait") {
# edition = "2015"
# source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/stable_deref_trait-1.1.1/src/lib.rs" # source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/stable_deref_trait-1.1.1/src/lib.rs"
# features = [ # features = [
# "default", # "default",
@ -1045,6 +1106,7 @@ rust_crate("source_map_mappings") {
# } # }
rust_crate("string") { rust_crate("string") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/string-0.1.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/string-0.1.3/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1053,6 +1115,7 @@ rust_crate("string") {
} }
rust_crate("tempfile") { rust_crate("tempfile") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tempfile-3.0.5/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tempfile-3.0.5/src/lib.rs"
extern = [ extern = [
":cfg_if", ":cfg_if",
@ -1072,6 +1135,7 @@ rust_crate("tempfile") {
} }
rust_crate("time") { rust_crate("time") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/time-0.1.42/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/time-0.1.42/src/lib.rs"
extern = [ ":libc" ] extern = [ ":libc" ]
args = [ args = [
@ -1084,6 +1148,7 @@ rust_crate("time") {
} }
rust_crate("tokio") { rust_crate("tokio") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-0.1.14/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-0.1.14/src/lib.rs"
features = [ features = [
"bytes", "bytes",
@ -1137,6 +1202,7 @@ rust_crate("tokio") {
} }
rust_crate("tokio_codec") { rust_crate("tokio_codec") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-codec-0.1.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-codec-0.1.1/src/lib.rs"
extern = [ extern = [
":bytes", ":bytes",
@ -1150,6 +1216,7 @@ rust_crate("tokio_codec") {
} }
rust_crate("tokio_current_thread") { rust_crate("tokio_current_thread") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-current-thread-0.1.4/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-current-thread-0.1.4/src/lib.rs"
extern = [ extern = [
":futures", ":futures",
@ -1162,6 +1229,7 @@ rust_crate("tokio_current_thread") {
} }
rust_crate("tokio_executor") { rust_crate("tokio_executor") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-executor-0.1.6/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-executor-0.1.6/src/lib.rs"
extern = [ extern = [
":crossbeam_utils", ":crossbeam_utils",
@ -1174,6 +1242,7 @@ rust_crate("tokio_executor") {
} }
rust_crate("tokio_fs") { rust_crate("tokio_fs") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-fs-0.1.5/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-fs-0.1.5/src/lib.rs"
extern = [ extern = [
":futures", ":futures",
@ -1187,6 +1256,7 @@ rust_crate("tokio_fs") {
} }
rust_crate("tokio_io") { rust_crate("tokio_io") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-io-0.1.11/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-io-0.1.11/src/lib.rs"
extern = [ extern = [
":bytes", ":bytes",
@ -1200,6 +1270,7 @@ rust_crate("tokio_io") {
} }
rust_crate("tokio_process") { rust_crate("tokio_process") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-process-0.2.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-process-0.2.3/src/lib.rs"
extern = [ extern = [
":futures", ":futures",
@ -1226,6 +1297,7 @@ rust_crate("tokio_process") {
} }
rust_crate("tokio_reactor") { rust_crate("tokio_reactor") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-reactor-0.1.8/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-reactor-0.1.8/src/lib.rs"
extern = [ extern = [
":crossbeam_utils", ":crossbeam_utils",
@ -1246,6 +1318,7 @@ rust_crate("tokio_reactor") {
} }
rust_crate("tokio_rustls") { rust_crate("tokio_rustls") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-rustls-0.8.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-rustls-0.8.1/src/lib.rs"
features = [ features = [
"default", "default",
@ -1266,6 +1339,7 @@ rust_crate("tokio_rustls") {
} }
rust_crate("tokio_tcp") { rust_crate("tokio_tcp") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-tcp-0.1.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-tcp-0.1.3/src/lib.rs"
extern = [ extern = [
":bytes", ":bytes",
@ -1282,6 +1356,7 @@ rust_crate("tokio_tcp") {
} }
rust_crate("tokio_threadpool") { rust_crate("tokio_threadpool") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-threadpool-0.1.10/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-threadpool-0.1.10/src/lib.rs"
extern = [ extern = [
":crossbeam_channel", ":crossbeam_channel",
@ -1300,6 +1375,7 @@ rust_crate("tokio_threadpool") {
} }
rust_crate("tokio_timer") { rust_crate("tokio_timer") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-timer-0.2.8/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-timer-0.2.8/src/lib.rs"
extern = [ extern = [
":crossbeam_utils", ":crossbeam_utils",
@ -1314,6 +1390,7 @@ rust_crate("tokio_timer") {
} }
rust_crate("tokio_udp") { rust_crate("tokio_udp") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-udp-0.1.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-udp-0.1.3/src/lib.rs"
extern = [ extern = [
":bytes", ":bytes",
@ -1331,6 +1408,7 @@ rust_crate("tokio_udp") {
} }
rust_crate("try_lock") { rust_crate("try_lock") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/try-lock-0.2.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/try-lock-0.2.2/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1339,6 +1417,7 @@ rust_crate("try_lock") {
} }
rust_crate("unicode_bidi") { rust_crate("unicode_bidi") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-bidi-0.3.4/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-bidi-0.3.4/src/lib.rs"
features = [ "default" ] features = [ "default" ]
extern = [ ":matches" ] extern = [ ":matches" ]
@ -1349,6 +1428,7 @@ rust_crate("unicode_bidi") {
} }
rust_crate("unicode_normalization") { rust_crate("unicode_normalization") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-normalization-0.1.7/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-normalization-0.1.7/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1357,6 +1437,7 @@ rust_crate("unicode_normalization") {
} }
rust_crate("unicode_segmentation") { rust_crate("unicode_segmentation") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-segmentation-1.2.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-segmentation-1.2.1/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1365,6 +1446,7 @@ rust_crate("unicode_segmentation") {
} }
rust_crate("unicode_width") { rust_crate("unicode_width") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-width-0.1.5/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unicode-width-0.1.5/src/lib.rs"
features = [ "default" ] features = [ "default" ]
args = [ args = [
@ -1374,6 +1456,7 @@ rust_crate("unicode_width") {
} }
rust_crate("unreachable") { rust_crate("unreachable") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unreachable-1.0.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/unreachable-1.0.0/src/lib.rs"
extern = [ ":void" ] extern = [ ":void" ]
args = [ args = [
@ -1383,6 +1466,7 @@ rust_crate("unreachable") {
} }
rust_crate("untrusted") { rust_crate("untrusted") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/untrusted-0.6.2/src/untrusted.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/untrusted-0.6.2/src/untrusted.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1391,6 +1475,7 @@ rust_crate("untrusted") {
} }
rust_crate("url") { rust_crate("url") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/url-1.7.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/url-1.7.2/src/lib.rs"
extern = [ extern = [
":idna", ":idna",
@ -1404,6 +1489,7 @@ rust_crate("url") {
} }
rust_crate("vlq") { rust_crate("vlq") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/vlq-0.5.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/vlq-0.5.1/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1412,6 +1498,7 @@ rust_crate("vlq") {
} }
rust_crate("void") { rust_crate("void") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/void-1.0.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/void-1.0.2/src/lib.rs"
features = [ features = [
"default", "default",
@ -1424,6 +1511,7 @@ rust_crate("void") {
} }
rust_crate("want") { rust_crate("want") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/want-0.0.6/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/want-0.0.6/src/lib.rs"
extern = [ extern = [
":futures", ":futures",
@ -1437,6 +1525,7 @@ rust_crate("want") {
} }
rust_crate("webpki") { rust_crate("webpki") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-0.18.1/src/webpki.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-0.18.1/src/webpki.rs"
features = [ features = [
"default", "default",
@ -1454,6 +1543,7 @@ rust_crate("webpki") {
} }
rust_crate("webpki_roots") { rust_crate("webpki_roots") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-roots-0.15.0/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/webpki-roots-0.15.0/src/lib.rs"
extern = [ extern = [
":untrusted", ":untrusted",
@ -1469,6 +1559,7 @@ rust_crate("webpki_roots") {
# rust_crate("rand-0.4.5") { # rust_crate("rand-0.4.5") {
# crate_name = "rand" # crate_name = "rand"
# crate_version = "0.4.5" # crate_version = "0.4.5"
# edition = "2015"
# source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand-0.4.5/src/lib.rs" # source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/rand-0.4.5/src/lib.rs"
# features = [ # features = [
# "default", # "default",
@ -1494,6 +1585,7 @@ rust_crate("webpki_roots") {
if (is_posix) { if (is_posix) {
rust_crate("arc_swap") { rust_crate("arc_swap") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/arc-swap-0.3.7/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/arc-swap-0.3.7/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1502,6 +1594,7 @@ if (is_posix) {
} }
rust_crate("bitflags") { rust_crate("bitflags") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/bitflags-1.0.4/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/bitflags-1.0.4/src/lib.rs"
features = [ "default" ] features = [ "default" ]
args = [ args = [
@ -1511,6 +1604,7 @@ if (is_posix) {
} }
rust_crate("mio_uds") { rust_crate("mio_uds") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-uds-0.6.7/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-uds-0.6.7/src/lib.rs"
extern = [ extern = [
":iovec", ":iovec",
@ -1524,6 +1618,7 @@ if (is_posix) {
} }
rust_crate("nix") { 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.11.0/src/lib.rs"
extern = [ extern = [
":bitflags", ":bitflags",
@ -1538,6 +1633,7 @@ if (is_posix) {
} }
rust_crate("signal_hook") { rust_crate("signal_hook") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/signal-hook-0.1.7/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/signal-hook-0.1.7/src/lib.rs"
extern = [ extern = [
":arc_swap", ":arc_swap",
@ -1550,6 +1646,7 @@ if (is_posix) {
} }
rust_crate("tokio_signal") { rust_crate("tokio_signal") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-signal-0.2.7/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-signal-0.2.7/src/lib.rs"
extern = [ extern = [
":futures", ":futures",
@ -1568,6 +1665,7 @@ if (is_posix) {
} }
rust_crate("tokio_uds") { rust_crate("tokio_uds") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-uds-0.2.5/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/tokio-uds-0.2.5/src/lib.rs"
extern = [ extern = [
":bytes", ":bytes",
@ -1588,6 +1686,7 @@ if (is_posix) {
} }
rust_crate("utf8parse") { rust_crate("utf8parse") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/utf8parse-0.1.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/utf8parse-0.1.1/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",
@ -1598,6 +1697,7 @@ if (is_posix) {
if (is_win) { if (is_win) {
rust_crate("kernel32") { rust_crate("kernel32") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/kernel32-sys-0.2.2/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/kernel32-sys-0.2.2/src/lib.rs"
extern_version = [ extern_version = [
{ {
@ -1615,6 +1715,7 @@ if (is_win) {
} }
rust_crate("mio_named_pipes") { rust_crate("mio_named_pipes") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-named-pipes-0.1.6/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/mio-named-pipes-0.1.6/src/lib.rs"
extern = [ extern = [
":log", ":log",
@ -1629,6 +1730,7 @@ if (is_win) {
} }
rust_crate("miow") { rust_crate("miow") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/miow-0.3.3/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/miow-0.3.3/src/lib.rs"
extern = [ extern = [
":socket2", ":socket2",
@ -1641,6 +1743,7 @@ if (is_win) {
} }
rust_crate("socket2") { rust_crate("socket2") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/socket2-0.3.8/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/socket2-0.3.8/src/lib.rs"
extern = [ ":winapi" ] extern = [ ":winapi" ]
args = [ args = [
@ -1650,6 +1753,7 @@ if (is_win) {
} }
rust_crate("winapi") { rust_crate("winapi") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/winapi-0.3.6/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/winapi-0.3.6/src/lib.rs"
features = [ features = [
"consoleapi", "consoleapi",
@ -1747,6 +1851,7 @@ if (is_win) {
} }
rust_crate("ws2_32") { rust_crate("ws2_32") {
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ws2_32-sys-0.2.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/ws2_32-sys-0.2.1/src/lib.rs"
extern_version = [ extern_version = [
{ {
@ -1766,6 +1871,7 @@ if (is_win) {
rust_crate("miow-0.2.1") { rust_crate("miow-0.2.1") {
crate_name = "miow" crate_name = "miow"
crate_version = "0.2.1" crate_version = "0.2.1"
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/miow-0.2.1/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/miow-0.2.1/src/lib.rs"
extern = [ extern = [
":kernel32", ":kernel32",
@ -1787,6 +1893,7 @@ if (is_win) {
rust_crate("winapi-0.2.8") { rust_crate("winapi-0.2.8") {
crate_name = "winapi" crate_name = "winapi"
crate_version = "0.2.8" crate_version = "0.2.8"
edition = "2015"
source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/winapi-0.2.8/src/lib.rs" source_root = "$cargo_home/registry/src/github.com-1ecc6299db9ec823/winapi-0.2.8/src/lib.rs"
args = [ args = [
"--cap-lints", "--cap-lints",

5
build_extra/rust/rust.gni
View file

@ -50,6 +50,7 @@ template("rust_crate") {
"crate_type", "crate_type",
"crate_version", "crate_version",
"deps", "deps",
"edition",
"inputs", "inputs",
"features", "features",
"is_test", "is_test",
@ -68,6 +69,9 @@ template("rust_crate") {
if (!defined(deps)) { if (!defined(deps)) {
deps = [] deps = []
} }
if (!defined(edition)) {
edition = "2018"
}
if (!defined(is_test)) { if (!defined(is_test)) {
is_test = false is_test = false
} }
@ -175,6 +179,7 @@ template("rust_crate") {
"--crate-name=$crate_name", "--crate-name=$crate_name",
"--crate-type=$crate_type", "--crate-type=$crate_type",
"--emit=$emit_type,dep-info", "--emit=$emit_type,dep-info",
"--edition=$edition",
"--out-dir=" + rebase_path(out_dir, root_build_dir), "--out-dir=" + rebase_path(out_dir, root_build_dir),
# This is to disambiguate multiple versions of the same crate. # This is to disambiguate multiple versions of the same crate.

14
src/compiler.rs
View file

@ -1,11 +1,11 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use isolate::Buf; use crate::isolate::Buf;
use isolate::IsolateState; use crate::isolate::IsolateState;
use msg; use crate::msg;
use resources; use crate::resources;
use resources::Resource; use crate::resources::Resource;
use resources::ResourceId; use crate::resources::ResourceId;
use workers; use crate::workers;
use futures::Future; use futures::Future;
use serde_json; use serde_json;

28
src/deno_dir.rs
View file

@ -1,15 +1,15 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use compiler::CodeFetchOutput; use crate::compiler::CodeFetchOutput;
use dirs; use crate::errors;
use errors; use crate::errors::DenoError;
use errors::DenoError; use crate::errors::DenoResult;
use errors::DenoResult; use crate::errors::ErrorKind;
use errors::ErrorKind; use crate::fs as deno_fs;
use fs as deno_fs; use crate::http_util;
use http_util; use crate::js_errors::SourceMapGetter;
use js_errors::SourceMapGetter; use crate::msg;
use msg;
use dirs;
use ring; use ring;
use std; use std;
use std::fmt::Write; use std::fmt::Write;
@ -395,7 +395,7 @@ impl DenoDir {
match j.scheme() { match j.scheme() {
"file" => { "file" => {
let mut p = deno_fs::normalize_path(j.to_file_path().unwrap().as_ref()); let p = deno_fs::normalize_path(j.to_file_path().unwrap().as_ref());
module_name = p.clone(); module_name = p.clone();
filename = p; filename = p;
} }
@ -540,8 +540,8 @@ fn filter_shebang(code: String) -> String {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::tokio_util;
use tempfile::TempDir; use tempfile::TempDir;
use tokio_util;
fn test_setup() -> (TempDir, DenoDir) { fn test_setup() -> (TempDir, DenoDir) {
let temp_dir = TempDir::new().expect("tempdir fail"); let temp_dir = TempDir::new().expect("tempdir fail");
@ -751,7 +751,7 @@ mod tests {
#[test] #[test]
fn test_fetch_source_1() { fn test_fetch_source_1() {
use tokio_util; use crate::tokio_util;
// http_util::fetch_sync_string requires tokio // http_util::fetch_sync_string requires tokio
tokio_util::init(|| { tokio_util::init(|| {
let (_temp_dir, deno_dir) = test_setup(); let (_temp_dir, deno_dir) = test_setup();
@ -786,7 +786,7 @@ mod tests {
#[test] #[test]
fn test_fetch_source_2() { fn test_fetch_source_2() {
use tokio_util; use crate::tokio_util;
// http_util::fetch_sync_string requires tokio // http_util::fetch_sync_string requires tokio
tokio_util::init(|| { tokio_util::init(|| {
let (_temp_dir, deno_dir) = test_setup(); let (_temp_dir, deno_dir) = test_setup();

7
src/eager_unix.rs
View file

@ -1,8 +1,7 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use crate::resources::{EagerAccept, EagerRead, EagerWrite, Resource};
use resources::{EagerAccept, EagerRead, EagerWrite, Resource}; use crate::tokio_util;
use tokio_util; use crate::tokio_write;
use tokio_write;
use futures::future::{self, Either}; use futures::future::{self, Either};
use std; use std;

8
src/errors.rs
View file

@ -1,7 +1,7 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
pub use msg::ErrorKind; pub use crate::msg::ErrorKind;
use resolve_addr::ResolveAddrError; use crate::resolve_addr::ResolveAddrError;
use hyper; use hyper;
use std; use std;
@ -95,7 +95,7 @@ impl DenoError {
} }
impl fmt::Display for DenoError { impl fmt::Display for DenoError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.repr { match self.repr {
Repr::Simple(_kind, ref err_str) => f.pad(err_str), Repr::Simple(_kind, ref err_str) => f.pad(err_str),
Repr::IoErr(ref err) => err.fmt(f), Repr::IoErr(ref err) => err.fmt(f),
@ -115,7 +115,7 @@ impl std::error::Error for DenoError {
} }
} }
fn cause(&self) -> Option<&std::error::Error> { fn cause(&self) -> Option<&dyn std::error::Error> {
match self.repr { match self.repr {
Repr::Simple(_kind, ref _msg) => None, Repr::Simple(_kind, ref _msg) => None,
Repr::IoErr(ref err) => Some(err), Repr::IoErr(ref err) => Some(err),

5
src/flags.rs
View file

@ -1,8 +1,9 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use crate::libdeno;
use getopts; use getopts;
use getopts::Options; use getopts::Options;
use libc::c_int; use libc::c_int;
use libdeno;
use std::ffi::CStr; use std::ffi::CStr;
use std::ffi::CString; use std::ffi::CString;
use std::mem; use std::mem;
@ -258,7 +259,7 @@ fn v8_set_flags_preprocess(args: Vec<String>) -> (Vec<String>, Vec<String>) {
args.into_iter().partition(|ref a| a.as_str() == "--help"); args.into_iter().partition(|ref a| a.as_str() == "--help");
// Replace args being sent to V8 // Replace args being sent to V8
for mut a in &mut v8_args { for a in &mut v8_args {
if a == "--v8-options" { if a == "--v8-options" {
mem::swap(a, &mut String::from("--help")); mem::swap(a, &mut String::from("--help"));
} }

6
src/http_util.rs
View file

@ -1,7 +1,7 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use errors; use crate::errors;
use errors::{DenoError, DenoResult}; use crate::errors::{DenoError, DenoResult};
use tokio_util; use crate::tokio_util;
use futures::future::{loop_fn, Loop}; use futures::future::{loop_fn, Loop};
use futures::{future, Future, Stream}; use futures::{future, Future, Stream};

24
src/isolate.rs
View file

@ -3,16 +3,17 @@
// TODO Currently this module uses Tokio, but it would be nice if they were // TODO Currently this module uses Tokio, but it would be nice if they were
// decoupled. // decoupled.
use compiler::compile_sync; use crate::compiler::compile_sync;
use compiler::CodeFetchOutput; use crate::compiler::CodeFetchOutput;
use deno_dir; use crate::deno_dir;
use errors::DenoError; use crate::errors::DenoError;
use errors::DenoResult; use crate::errors::DenoResult;
use flags; use crate::flags;
use js_errors::JSError; use crate::js_errors::JSError;
use libdeno; use crate::libdeno;
use msg; use crate::msg;
use permissions::DenoPermissions; use crate::permissions::DenoPermissions;
use crate::tokio_util;
use futures::sync::mpsc as async_mpsc; use futures::sync::mpsc as async_mpsc;
use futures::Future; use futures::Future;
@ -30,7 +31,6 @@ use std::sync::Mutex;
use std::time::Duration; use std::time::Duration;
use std::time::Instant; use std::time::Instant;
use tokio; use tokio;
use tokio_util;
// Buf represents a byte array returned from a "Op". // Buf represents a byte array returned from a "Op".
// The message might be empty (which will be translated into a null object on // The message might be empty (which will be translated into a null object on
@ -40,7 +40,7 @@ pub type Buf = Box<[u8]>;
// JS promises in Deno map onto a specific Future // JS promises in Deno map onto a specific Future
// which yields either a DenoError or a byte array. // which yields either a DenoError or a byte array.
pub type Op = Future<Item = Buf, Error = DenoError> + Send; pub type Op = dyn Future<Item = Buf, Error = DenoError> + Send;
// Returns (is_sync, op) // Returns (is_sync, op)
pub type Dispatch = pub type Dispatch =

8
src/js_errors.rs
View file

@ -184,7 +184,7 @@ impl StackFrame {
fn apply_source_map( fn apply_source_map(
&self, &self,
mappings_map: &mut CachedMaps, mappings_map: &mut CachedMaps,
getter: &SourceMapGetter, getter: &dyn SourceMapGetter,
) -> StackFrame { ) -> StackFrame {
let maybe_sm = let maybe_sm =
get_mappings(self.script_name.as_ref(), mappings_map, getter); get_mappings(self.script_name.as_ref(), mappings_map, getter);
@ -319,7 +319,7 @@ impl JSError {
}) })
} }
pub fn apply_source_map(&self, getter: &SourceMapGetter) -> Self { pub fn apply_source_map(&self, getter: &dyn SourceMapGetter) -> Self {
let mut mappings_map: CachedMaps = HashMap::new(); let mut mappings_map: CachedMaps = HashMap::new();
let mut frames = Vec::<StackFrame>::new(); let mut frames = Vec::<StackFrame>::new();
for frame in &self.frames { for frame in &self.frames {
@ -344,7 +344,7 @@ impl JSError {
fn parse_map_string( fn parse_map_string(
script_name: &str, script_name: &str,
getter: &SourceMapGetter, getter: &dyn SourceMapGetter,
) -> Option<SourceMap> { ) -> Option<SourceMap> {
match script_name { match script_name {
// The bundle does not get built for 'cargo check', so we don't embed the // The bundle does not get built for 'cargo check', so we don't embed the
@ -365,7 +365,7 @@ fn parse_map_string(
fn get_mappings<'a>( fn get_mappings<'a>(
script_name: &str, script_name: &str,
mappings_map: &'a mut CachedMaps, mappings_map: &'a mut CachedMaps,
getter: &SourceMapGetter, getter: &dyn SourceMapGetter,
) -> &'a Option<SourceMap> { ) -> &'a Option<SourceMap> {
mappings_map mappings_map
.entry(script_name.to_string()) .entry(script_name.to_string())

44
src/main.rs
View file

@ -1,24 +1,24 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
extern crate dirs; use dirs;
extern crate flatbuffers; use flatbuffers;
extern crate getopts; use getopts;
extern crate http; use http;
extern crate hyper; use hyper;
extern crate hyper_rustls; use hyper_rustls;
extern crate libc; use libc;
extern crate rand; use rand;
extern crate remove_dir_all; use remove_dir_all;
extern crate ring; use ring;
extern crate rustyline; use rustyline;
extern crate source_map_mappings; use source_map_mappings;
extern crate tempfile; use tempfile;
extern crate tokio; use tokio;
extern crate tokio_executor; use tokio_executor;
extern crate tokio_fs; use tokio_fs;
extern crate tokio_io; use tokio_io;
extern crate tokio_process; use tokio_process;
extern crate tokio_threadpool; use tokio_threadpool;
extern crate url; use url;
#[macro_use] #[macro_use]
extern crate lazy_static; extern crate lazy_static;
@ -63,11 +63,11 @@ static LOGGER: Logger = Logger;
struct Logger; struct Logger;
impl log::Log for Logger { impl log::Log for Logger {
fn enabled(&self, metadata: &log::Metadata) -> bool { fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
metadata.level() <= log::max_level() metadata.level() <= log::max_level()
} }
fn log(&self, record: &log::Record) { fn log(&self, record: &log::Record<'_>) {
if self.enabled(record.metadata()) { if self.enabled(record.metadata()) {
println!("{} RS - {}", record.level(), record.args()); println!("{} RS - {}", record.level(), record.args());
} }

9
src/msg_util.rs
View file

@ -1,7 +1,9 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
// Helpers for serialization. // Helpers for serialization.
use errors; use crate::errors;
use errors::DenoResult; use crate::errors::DenoResult;
use crate::msg;
use flatbuffers; use flatbuffers;
use http::header::HeaderName; use http::header::HeaderName;
use http::uri::Uri; use http::uri::Uri;
@ -11,7 +13,6 @@ use hyper::header::HeaderValue;
use hyper::Body; use hyper::Body;
use hyper::Request; use hyper::Request;
use hyper::Response; use hyper::Response;
use msg;
use std::str::FromStr; use std::str::FromStr;
type Headers = HeaderMap<HeaderValue>; type Headers = HeaderMap<HeaderValue>;
@ -94,7 +95,7 @@ pub fn serialize_http_response<'bldr>(
} }
pub fn deserialize_request( pub fn deserialize_request(
header_msg: msg::HttpHeader, header_msg: msg::HttpHeader<'_>,
body: Body, body: Body,
) -> DenoResult<Request<Body>> { ) -> DenoResult<Request<Body>> {
let mut r = Request::new(body); let mut r = Request::new(body);

122
src/ops.rs
View file

@ -1,19 +1,22 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use errors; use crate::errors;
use errors::{DenoError, DenoResult, ErrorKind}; use crate::errors::{DenoError, DenoResult, ErrorKind};
use fs as deno_fs; use crate::fs as deno_fs;
use http_util; use crate::http_util;
use isolate::Buf; use crate::isolate::Buf;
use isolate::Isolate; use crate::isolate::Isolate;
use isolate::IsolateState; use crate::isolate::IsolateState;
use isolate::Op; use crate::isolate::Op;
use libdeno; use crate::libdeno;
use msg; use crate::msg;
use msg_util; use crate::msg_util;
use resolve_addr::resolve_addr; use crate::repl;
use resources; use crate::resolve_addr::resolve_addr;
use resources::Resource; use crate::resources;
use version; use crate::resources::table_entries;
use crate::resources::Resource;
use crate::tokio_util;
use crate::version;
use flatbuffers::FlatBufferBuilder; use flatbuffers::FlatBufferBuilder;
use futures; use futures;
@ -24,8 +27,6 @@ use futures::Stream;
use hyper; use hyper;
use hyper::rt::Future; use hyper::rt::Future;
use remove_dir_all::remove_dir_all; use remove_dir_all::remove_dir_all;
use repl;
use resources::table_entries;
use std; use std;
use std::convert::From; use std::convert::From;
use std::fs; use std::fs;
@ -45,14 +46,13 @@ use tokio::net::TcpListener;
use tokio::net::TcpStream; use tokio::net::TcpStream;
use tokio_process::CommandExt; use tokio_process::CommandExt;
use tokio_threadpool; use tokio_threadpool;
use tokio_util;
type OpResult = DenoResult<Buf>; type OpResult = DenoResult<Buf>;
// TODO Ideally we wouldn't have to box the Op being returned. // TODO Ideally we wouldn't have to box the Op being returned.
// The box is just to make it easier to get a prototype refactor working. // The box is just to make it easier to get a prototype refactor working.
type OpCreator = type OpCreator =
fn(state: &Arc<IsolateState>, base: &msg::Base, data: libdeno::deno_buf) fn(state: &Arc<IsolateState>, base: &msg::Base<'_>, data: libdeno::deno_buf)
-> Box<Op>; -> Box<Op>;
#[inline] #[inline]
@ -175,7 +175,7 @@ pub fn dispatch(
fn op_exit( fn op_exit(
_config: &Arc<IsolateState>, _config: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
_data: libdeno::deno_buf, _data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
let inner = base.inner_as_exit().unwrap(); let inner = base.inner_as_exit().unwrap();
@ -184,7 +184,7 @@ fn op_exit(
fn op_start( fn op_start(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -232,8 +232,8 @@ fn op_start(
fn serialize_response( fn serialize_response(
cmd_id: u32, cmd_id: u32,
builder: &mut FlatBufferBuilder, builder: &mut FlatBufferBuilder<'_>,
mut args: msg::BaseArgs, mut args: msg::BaseArgs<'_>,
) -> Buf { ) -> Buf {
args.cmd_id = cmd_id; args.cmd_id = cmd_id;
let base = msg::Base::create(builder, &args); let base = msg::Base::create(builder, &args);
@ -257,7 +257,7 @@ pub fn odd_future(err: DenoError) -> Box<Op> {
// https://github.com/denoland/deno/blob/golang/os.go#L100-L154 // https://github.com/denoland/deno/blob/golang/os.go#L100-L154
fn op_code_fetch( fn op_code_fetch(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -300,7 +300,7 @@ fn op_code_fetch(
// https://github.com/denoland/deno/blob/golang/os.go#L156-L169 // https://github.com/denoland/deno/blob/golang/os.go#L156-L169
fn op_code_cache( fn op_code_cache(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -319,7 +319,7 @@ fn op_code_cache(
fn op_chdir( fn op_chdir(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -333,7 +333,7 @@ fn op_chdir(
fn op_set_timeout( fn op_set_timeout(
isolate: &Isolate, isolate: &Isolate,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -351,7 +351,7 @@ fn op_set_timeout(
fn op_set_env( fn op_set_env(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -367,7 +367,7 @@ fn op_set_env(
fn op_env( fn op_env(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -399,7 +399,7 @@ fn op_env(
fn op_fetch( fn op_fetch(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
let inner = base.inner_as_fetch().unwrap(); let inner = base.inner_as_fetch().unwrap();
@ -486,7 +486,7 @@ where
fn op_make_temp_dir( fn op_make_temp_dir(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -535,7 +535,7 @@ fn op_make_temp_dir(
fn op_mkdir( fn op_mkdir(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -555,7 +555,7 @@ fn op_mkdir(
fn op_chmod( fn op_chmod(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -588,7 +588,7 @@ fn op_chmod(
fn op_open( fn op_open(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -664,7 +664,7 @@ fn op_open(
fn op_close( fn op_close(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -681,7 +681,7 @@ fn op_close(
fn op_shutdown( fn op_shutdown(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -707,7 +707,7 @@ fn op_shutdown(
fn op_read( fn op_read(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
let cmd_id = base.cmd_id(); let cmd_id = base.cmd_id();
@ -745,7 +745,7 @@ fn op_read(
fn op_write( fn op_write(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
let cmd_id = base.cmd_id(); let cmd_id = base.cmd_id();
@ -782,7 +782,7 @@ fn op_write(
fn op_remove( fn op_remove(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -812,7 +812,7 @@ fn op_remove(
// Prototype https://github.com/denoland/deno/blob/golang/os.go#L171-L184 // Prototype https://github.com/denoland/deno/blob/golang/os.go#L171-L184
fn op_read_file( fn op_read_file(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -846,7 +846,7 @@ fn op_read_file(
fn op_copy_file( fn op_copy_file(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -898,7 +898,7 @@ fn get_mode(_perm: &fs::Permissions) -> u32 {
fn op_cwd( fn op_cwd(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -924,7 +924,7 @@ fn op_cwd(
fn op_stat( fn op_stat(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -971,7 +971,7 @@ fn op_stat(
fn op_read_dir( fn op_read_dir(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1029,7 +1029,7 @@ fn op_read_dir(
fn op_write_file( fn op_write_file(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
let inner = base.inner_as_write_file().unwrap(); let inner = base.inner_as_write_file().unwrap();
@ -1049,7 +1049,7 @@ fn op_write_file(
fn op_rename( fn op_rename(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1069,7 +1069,7 @@ fn op_rename(
fn op_symlink( fn op_symlink(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1098,7 +1098,7 @@ fn op_symlink(
fn op_read_link( fn op_read_link(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1131,7 +1131,7 @@ fn op_read_link(
fn op_repl_start( fn op_repl_start(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1162,7 +1162,7 @@ fn op_repl_start(
fn op_repl_readline( fn op_repl_readline(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1200,7 +1200,7 @@ fn op_repl_readline(
fn op_truncate( fn op_truncate(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1223,7 +1223,7 @@ fn op_truncate(
fn op_listen( fn op_listen(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1288,7 +1288,7 @@ fn new_conn(cmd_id: u32, tcp_stream: TcpStream) -> OpResult {
fn op_accept( fn op_accept(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1314,7 +1314,7 @@ fn op_accept(
fn op_dial( fn op_dial(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1340,7 +1340,7 @@ fn op_dial(
fn op_metrics( fn op_metrics(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1364,7 +1364,7 @@ fn op_metrics(
fn op_resources( fn op_resources(
_state: &Arc<IsolateState>, _state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1416,7 +1416,7 @@ fn subprocess_stdio_map(v: msg::ProcessStdio) -> std::process::Stdio {
fn op_run( fn op_run(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert!(base.sync()); assert!(base.sync());
@ -1484,7 +1484,7 @@ fn op_run(
fn op_run_status( fn op_run_status(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1560,7 +1560,7 @@ impl Future for GetMessageFuture {
fn op_worker_get_message( fn op_worker_get_message(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
assert_eq!(data.len(), 0); assert_eq!(data.len(), 0);
@ -1594,7 +1594,7 @@ fn op_worker_get_message(
fn op_worker_post_message( fn op_worker_post_message(
state: &Arc<IsolateState>, state: &Arc<IsolateState>,
base: &msg::Base, base: &msg::Base<'_>,
data: libdeno::deno_buf, data: libdeno::deno_buf,
) -> Box<Op> { ) -> Box<Op> {
let cmd_id = base.cmd_id(); let cmd_id = base.cmd_id();
@ -1605,7 +1605,7 @@ fn op_worker_post_message(
let tx = match state.worker_channels { let tx = match state.worker_channels {
None => panic!("expected worker_channels"), None => panic!("expected worker_channels"),
Some(ref wc) => { Some(ref wc) => {
let mut wc = wc.lock().unwrap(); let wc = wc.lock().unwrap();
wc.0.clone() wc.0.clone()
} }
}; };

8
src/permissions.rs
View file

@ -1,9 +1,9 @@
extern crate atty; use atty;
use flags::DenoFlags; use crate::flags::DenoFlags;
use errors::permission_denied; use crate::errors::permission_denied;
use errors::DenoResult; use crate::errors::DenoResult;
use std::io; use std::io;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};

10
src/repl.rs
View file

@ -1,14 +1,14 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
extern crate rustyline; use rustyline;
use rustyline::error::ReadlineError::Interrupted; use rustyline::error::ReadlineError::Interrupted;
use msg::ErrorKind; use crate::msg::ErrorKind;
use std::error::Error; use std::error::Error;
use deno_dir::DenoDir; use crate::deno_dir::DenoDir;
use errors::new as deno_error; use crate::errors::new as deno_error;
use errors::DenoResult; use crate::errors::DenoResult;
use std::path::PathBuf; use std::path::PathBuf;
use std::process::exit; use std::process::exit;

2
src/resolve_addr.rs
View file

@ -28,7 +28,7 @@ pub enum ResolveAddrError {
} }
impl fmt::Display for ResolveAddrError { impl fmt::Display for ResolveAddrError {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt.write_str(self.description()) fmt.write_str(self.description())
} }
} }

22
src/resources.rs
View file

@ -9,16 +9,17 @@
// handlers) look up resources by their integer id here. // handlers) look up resources by their integer id here.
#[cfg(unix)] #[cfg(unix)]
use eager_unix as eager; use crate::eager_unix as eager;
use errors; use crate::errors;
use errors::bad_resource; use crate::errors::bad_resource;
use errors::DenoError; use crate::errors::DenoError;
use errors::DenoResult; use crate::errors::DenoResult;
use http_body::HttpBody; use crate::http_body::HttpBody;
use isolate::WorkerChannels; use crate::isolate::Buf;
use repl::Repl; use crate::isolate::WorkerChannels;
use tokio_util; use crate::repl::Repl;
use tokio_write; use crate::tokio_util;
use crate::tokio_write;
use futures; use futures;
use futures::future::{Either, FutureResult}; use futures::future::{Either, FutureResult};
@ -27,7 +28,6 @@ use futures::Poll;
use futures::Sink; use futures::Sink;
use futures::Stream; use futures::Stream;
use hyper; use hyper;
use isolate::Buf;
use std; use std;
use std::collections::HashMap; use std::collections::HashMap;
use std::io::{Error, Read, Write}; use std::io::{Error, Read, Write};

2
src/snapshot.rs
View file

@ -1,5 +1,5 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use libdeno::deno_buf; use crate::libdeno::deno_buf;
pub fn deno_snapshot() -> deno_buf { pub fn deno_snapshot() -> deno_buf {
#[cfg(not(feature = "check-only"))] #[cfg(not(feature = "check-only"))]

2
src/tokio_util.rs
View file

@ -1,5 +1,5 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use resources::Resource; use crate::resources::Resource;
use futures; use futures;
use futures::Future; use futures::Future;

3
src/version.rs
View file

@ -1,5 +1,6 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
use libdeno; use crate::libdeno;
use std::ffi::CStr; use std::ffi::CStr;
pub const DENO: &str = env!("CARGO_PKG_VERSION"); pub const DENO: &str = env!("CARGO_PKG_VERSION");

18
src/workers.rs
View file

@ -1,13 +1,13 @@
// Copyright 2018 the Deno authors. All rights reserved. MIT license. // Copyright 2018 the Deno authors. All rights reserved. MIT license.
use isolate::Buf; use crate::isolate::Buf;
use isolate::Isolate; use crate::isolate::Isolate;
use isolate::IsolateState; use crate::isolate::IsolateState;
use isolate::WorkerChannels; use crate::isolate::WorkerChannels;
use js_errors::JSError; use crate::js_errors::JSError;
use ops; use crate::ops;
use resources; use crate::resources;
use snapshot; use crate::snapshot;
use tokio_util; use crate::tokio_util;
use futures::sync::mpsc; use futures::sync::mpsc;
use futures::sync::oneshot; use futures::sync::oneshot;