Skip to content

Commit

Permalink
chore: update dependencies (denoland#11856)
Browse files Browse the repository at this point in the history
Co-authored-by: Bartek Iwańczuk <[email protected]>
  • Loading branch information
lucacasonato and bartlomieju committed Sep 2, 2021
1 parent c84532b commit 1bf7b90
Show file tree
Hide file tree
Showing 22 changed files with 257 additions and 216 deletions.
324 changes: 185 additions & 139 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bench_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ description = "Bench and profiling utilities for deno crates"
[dependencies]
bencher = "0.1"
deno_core = { version = "0.98.0", path = "../core" }
tokio = { version = "1.8.0", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }

[[bench]]
name = "op_baseline"
Expand Down
24 changes: 12 additions & 12 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ deno_webgpu = { version = "0.17.0", path = "../ext/webgpu" }
deno_webidl = { version = "0.16.0", path = "../ext/webidl" }
deno_websocket = { version = "0.21.0", path = "../ext/websocket" }
deno_webstorage = { version = "0.11.0", path = "../ext/webstorage" }
regex = "1.4.3"
serde = { version = "1.0.125", features = ["derive"] }
regex = "1.5.4"
serde = { version = "1.0.129", features = ["derive"] }

[target.'cfg(windows)'.build-dependencies]
winapi = "0.3.9"
Expand All @@ -61,27 +61,27 @@ dprint-plugin-markdown = "0.9.6"
dprint-plugin-typescript = "0.53.0"
encoding_rs = "0.8.28"
env_logger = "0.8.4"
fancy-regex = "0.5.0"
fancy-regex = "0.7.1"
filetime = "0.2.14"
http = "0.2.4"
# TODO(lucacasonato): unlock when https://github.com/tkaitchuck/aHash/issues/95 is resolved
indexmap = { version = "=1.6.2", features = ["serde"] }
jsonc-parser = { version = "0.17.0", features = ["serde"] }
lazy_static = "1.4.0"
libc = "0.2.98"
libc = "0.2.101"
log = { version = "0.4.14", features = ["serde"] }
lspower = "1.1.0"
notify = "5.0.0-pre.10"
notify = "5.0.0-pre.12"
num_cpus = "1.13.0"
percent-encoding = "2.1.0"
pin-project = "1.0.7"
pin-project = "1.0.8"
rand = { version = "0.8.4", features = ["small_rng"] }
regex = "1.4.3"
regex = "1.5.4"
ring = "0.16.20"
rustyline = { version = "8.2.0", default-features = false }
rustyline-derive = "0.4.0"
rustyline = { version = "9.0.0", default-features = false }
rustyline-derive = "0.5.0"
semver-parser = "0.10.2"
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.129", features = ["derive"] }
shell-escape = "0.1.5"
sourcemap = "6.0.1"
swc_bundler = "0.56.0"
Expand All @@ -90,7 +90,7 @@ swc_ecmascript = { version = "0.60.0", features = ["codegen", "dep_graph", "pars
tempfile = "3.2.0"
termcolor = "1.1.2"
text-size = "1.1.0"
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }
tokio-rustls = "0.22.0"
uuid = { version = "0.8.2", features = ["v4", "serde"] }
walkdir = "2.3.2"
Expand All @@ -111,7 +111,7 @@ trust-dns-server = "0.20.3"

[target.'cfg(unix)'.dev-dependencies]
exec = "0.3.1" # Used in test_raw_tty
nix = "0.20.0"
nix = "0.22.1"

[package.metadata.winres]
# This section defines the metadata that appears in the deno.exe PE header.
Expand Down
2 changes: 1 addition & 1 deletion cli/file_watcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ fn new_watcher(
let changed_paths = Arc::clone(&debounce.changed_paths);

let mut watcher: RecommendedWatcher =
Watcher::new_immediate(move |res: Result<NotifyEvent, NotifyError>| {
Watcher::new(move |res: Result<NotifyEvent, NotifyError>| {
if let Ok(event) = res {
if matches!(
event.kind,
Expand Down
12 changes: 6 additions & 6 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ description = "A secure JavaScript/TypeScript runtime built with V8, Rust, and T
path = "lib.rs"

[dependencies]
anyhow = "1.0.41"
futures = "0.3.15"
anyhow = "1.0.43"
futures = "0.3.16"
# TODO(lucacasonato): unlock when https://github.com/tkaitchuck/aHash/issues/95 is resolved
indexmap = "=1.6.2"
lazy_static = "1.4.0"
libc = "0.2.98"
libc = "0.2.101"
log = "0.4.14"
parking_lot = "0.11.1"
pin-project = "1.0.7"
rusty_v8 = "0.27.0"
serde = { version = "1.0.126", features = ["derive"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
serde = { version = "1.0.129", features = ["derive"] }
serde_json = { version = "1.0.66", features = ["preserve_order"] }
serde_v8 = { version = "0.10.0" }
url = { version = "2.2.2", features = ["serde"] }

Expand All @@ -34,4 +34,4 @@ path = "examples/http_bench_json_ops.rs"

# These dependencies are only used for the 'http_bench_*_ops' examples.
[dev-dependencies]
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }
2 changes: 1 addition & 1 deletion ext/broadcast_channel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ path = "lib.rs"
[dependencies]
async-trait = "0.1"
deno_core = { version = "0.98.0", path = "../../core" }
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }
uuid = { version = "0.8.2", features = ["v4"] }
4 changes: 2 additions & 2 deletions ext/crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ num-traits = "0.2.14"
rand = "0.8.4"
ring = { version = "0.16.20", features = ["std"] }
rsa = { version = "0.5.0", default-features = false, features = ["std"] }
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.129", features = ["derive"] }
sha-1 = "0.9.7"
sha2 = "0.9.5"
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }
uuid = { version = "0.8.2", features = ["v4"] }
6 changes: 3 additions & 3 deletions ext/fetch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ description = "Fetch API implementation for Deno"
path = "lib.rs"

[dependencies]
bytes = "1.0.1"
bytes = "1.1.0"
data-url = "0.1.0"
deno_core = { version = "0.98.0", path = "../../core" }
deno_tls = { version = "0.3.0", path = "../tls" }
deno_web = { version = "0.47.0", path = "../web" }
http = "0.2.4"
lazy_static = "1.4.0"
reqwest = { version = "0.11.4", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] }
serde = { version = "1.0.126", features = ["derive"] }
tokio = { version = "1.8.1", features = ["full"] }
serde = { version = "1.0.129", features = ["derive"] }
tokio = { version = "1.10.1", features = ["full"] }
tokio-stream = "0.1.7"
tokio-util = "0.6.7"
2 changes: 1 addition & 1 deletion ext/ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ path = "lib.rs"
deno_core = { version = "0.98.0", path = "../../core" }
dlopen = "0.1.8"
libffi = { version = "=0.0.7", package = "deno-libffi" }
serde = { version = "1.0.125", features = ["derive"] }
serde = { version = "1.0.129", features = ["derive"] }
4 changes: 2 additions & 2 deletions ext/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ deno_core = { version = "0.98.0", path = "../../core" }
deno_websocket = { version = "0.21.0", path = "../websocket" }
hyper = { version = "0.14.9", features = ["server", "stream", "http1", "http2", "runtime"] }
ring = "0.16.20"
serde = { version = "1.0.125", features = ["derive"] }
tokio = { version = "1.8.0", features = ["full"] }
serde = { version = "1.0.129", features = ["derive"] }
tokio = { version = "1.10.1", features = ["full"] }
tokio-util = { version = "0.6.7", features = ["io"] }
4 changes: 2 additions & 2 deletions ext/net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ deno_tls = { version = "0.3.0", path = "../tls" }

lazy_static = "1.4.0"
log = "0.4.14"
serde = { version = "1.0.126", features = ["derive"] }
tokio = { version = "1.8.1", features = ["full"] }
serde = { version = "1.0.129", features = ["derive"] }
tokio = { version = "1.10.1", features = ["full"] }
trust-dns-proto = "0.20.3"
trust-dns-resolver = { version = "0.20.3", features = ["tokio-runtime", "serde-config"] }
2 changes: 1 addition & 1 deletion ext/timers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ path = "lib.rs"

[dependencies]
deno_core = { version = "0.98.0", path = "../../core" }
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }

[dev-dependencies]
deno_bench_util = { version = "0.10.0", path = "../../bench_util" }
Expand Down
2 changes: 1 addition & 1 deletion ext/tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ lazy_static = "1.4.0"
reqwest = { version = "0.11.4", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli"] }
rustls = { version = "0.19.1", features = ["dangerous_configuration"] }
rustls-native-certs = "0.5.0"
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.129", features = ["derive"] }
webpki = "0.21.4"
webpki-roots = "0.21.1"
2 changes: 1 addition & 1 deletion ext/url/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ path = "lib.rs"
deno_core = { version = "0.98.0", path = "../../core" }
idna = "0.2.3"
percent-encoding = "2.1.0"
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.129", features = ["derive"] }
serde_repr = "0.1.7"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions ext/web/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ description = "Collection of Web APIs"
path = "lib.rs"

[dependencies]
async-trait = "0.1.50"
async-trait = "0.1.51"
base64 = "0.13.0"
deno_core = { version = "0.98.0", path = "../../core" }
encoding_rs = "0.8.28"
serde = "1.0"
tokio = { version = "1.8.1", features = ["full"] }
serde = "1.0.129"
tokio = { version = "1.10.1", features = ["full"] }
uuid = { version = "0.8.2", features = ["v4", "serde"] }

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions ext/webgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ path = "lib.rs"

[dependencies]
deno_core = { version = "0.98.0", path = "../../core" }
serde = { version = "1.0.126", features = ["derive"] }
tokio = { version = "1.8.1", features = ["full"] }
wgpu-core = { version = "0.10.0", features = ["trace"] }
serde = { version = "1.0.129", features = ["derive"] }
tokio = { version = "1.10.1", features = ["full"] }
wgpu-core = { version = "0.10.1", features = ["trace"] }
wgpu-types = "0.10.0"
6 changes: 3 additions & 3 deletions ext/websocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ path = "lib.rs"
deno_core = { version = "0.98.0", path = "../../core" }
deno_tls = { version = "0.3.0", path = "../tls" }
http = "0.2.4"
hyper = { version = "0.14.9" }
serde = { version = "1.0.126", features = ["derive"] }
tokio = { version = "1.8.1", features = ["full"] }
hyper = { version = "0.14.12" }
serde = { version = "1.0.129", features = ["derive"] }
tokio = { version = "1.10.1", features = ["full"] }
tokio-rustls = "0.22.0"
tokio-tungstenite = { version = "0.14.0", features = ["rustls-tls"] }
2 changes: 1 addition & 1 deletion ext/webstorage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ path = "lib.rs"
deno_core = { version = "0.98.0", path = "../../core" }
deno_web = { version = "0.47.0", path = "../web" }
rusqlite = { version = "0.25.3", features = ["unlock_notify", "bundled"] }
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.129", features = ["derive"] }
16 changes: 8 additions & 8 deletions runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,31 @@ deno_webstorage = { version = "0.11.0", path = "../ext/webstorage" }
atty = "0.2.14"
dlopen = "0.1.8"
encoding_rs = "0.8.28"
filetime = "0.2.14"
filetime = "0.2.15"
fs3 = "0.5.0"
http = "0.2.4"
hyper = { version = "0.14.10", features = ["server", "stream", "http1", "http2", "runtime"] }
hyper = { version = "0.14.12", features = ["server", "stream", "http1", "http2", "runtime"] }
# TODO(lucacasonato): unlock when https://github.com/tkaitchuck/aHash/issues/95 is resolved
indexmap = "=1.6.2"
lazy_static = "1.4.0"
libc = "0.2.98"
libc = "0.2.101"
log = "0.4.14"
notify = "=5.0.0-pre.10"
notify = "=5.0.0-pre.12"
percent-encoding = "2.1.0"
regex = "1.4.3"
regex = "1.5.4"
ring = "0.16.20"
serde = { version = "1.0.126", features = ["derive"] }
serde = { version = "1.0.129", features = ["derive"] }
sys-info = "0.9.0"
termcolor = "1.1.2"
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }
uuid = { version = "0.8.2", features = ["v4"] }

[target.'cfg(windows)'.dependencies]
fwdansi = "1.1.0"
winapi = { version = "0.3.9", features = ["knownfolders", "mswsock", "objbase", "shlobj", "tlhelp32", "winbase", "winerror", "winsock2"] }

[target.'cfg(unix)'.dependencies]
nix = "0.20.0"
nix = "0.22.1"

[dev-dependencies]
# Used in benchmark
Expand Down
21 changes: 9 additions & 12 deletions runtime/errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,16 @@ fn get_hyper_error_class(_error: &hyper::Error) -> &'static str {

#[cfg(unix)]
fn get_nix_error_class(error: &nix::Error) -> &'static str {
use nix::errno::Errno::*;
match error {
nix::Error::Sys(ECHILD) => "NotFound",
nix::Error::Sys(EINVAL) => "TypeError",
nix::Error::Sys(ENOENT) => "NotFound",
nix::Error::Sys(ENOTTY) => "BadResource",
nix::Error::Sys(EPERM) => "PermissionDenied",
nix::Error::Sys(ESRCH) => "NotFound",
nix::Error::Sys(UnknownErrno) => "Error",
nix::Error::Sys(_) => "Error",
nix::Error::InvalidPath => "TypeError",
nix::Error::InvalidUtf8 => "InvalidData",
nix::Error::UnsupportedOperation => unreachable!(),
nix::Error::ECHILD => "NotFound",
nix::Error::EINVAL => "TypeError",
nix::Error::ENOENT => "NotFound",
nix::Error::ENOTTY => "BadResource",
nix::Error::EPERM => "PermissionDenied",
nix::Error::ESRCH => "NotFound",
nix::Error::UnknownErrno => "Error",
&nix::Error::ENOTSUP => unreachable!(),
_ => "Error",
}
}

Expand Down
10 changes: 4 additions & 6 deletions runtime/ops/fs_events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ fn op_fs_events_open(
let (sender, receiver) = mpsc::channel::<Result<FsEvent, AnyError>>(16);
let sender = Mutex::new(sender);
let mut watcher: RecommendedWatcher =
Watcher::new_immediate(move |res: Result<NotifyEvent, NotifyError>| {
Watcher::new(move |res: Result<NotifyEvent, NotifyError>| {
let res2 = res.map(FsEvent::from).map_err(AnyError::from);
let sender = sender.lock();
// Ignore result, if send failed it means that watcher was already closed,
Expand All @@ -114,11 +114,9 @@ fn op_fs_events_open(
RecursiveMode::NonRecursive
};
for path in &args.paths {
state
.borrow_mut::<Permissions>()
.read
.check(&PathBuf::from(path))?;
watcher.watch(path, recursive_mode)?;
let path = PathBuf::from(path);
state.borrow_mut::<Permissions>().read.check(&path)?;
watcher.watch(&path, recursive_mode)?;
}
let resource = FsEventsResource {
watcher,
Expand Down
14 changes: 7 additions & 7 deletions test_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ name = "test_server"
path = "src/test_server.rs"

[dependencies]
anyhow = "1.0.41"
anyhow = "1.0.43"
async-stream = "0.3.2"
bytes = "1.0.1"
futures = "0.3.15"
hyper = { version = "0.14.10", features = ["server", "http1", "runtime"] }
bytes = "1.1.0"
futures = "0.3.16"
hyper = { version = "0.14.12", features = ["server", "http1", "runtime"] }
lazy_static = "1.4.0"
os_pipe = "0.9.2"
regex = "1.4.3"
regex = "1.5.4"
serde = { version = "1.0.126", features = ["derive"] }
serde_json = "1.0.64"
serde_json = "1.0.65"
tempfile = "3.2.0"
tokio = { version = "1.8.1", features = ["full"] }
tokio = { version = "1.10.1", features = ["full"] }
tokio-rustls = "0.22.0"
tokio-tungstenite = "0.14.0"

Expand Down

0 comments on commit 1bf7b90

Please sign in to comment.