foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

chore: upgrade dependencies (#24565)

Browse source 
rustls + hyper + deno_core
This commit is contained in:
snek 2024-07-15 09:56:51 -07:00 committed by GitHub
parent 702f7ee89c
commit 70a9631696
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 92 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/ci.generate.ts vendored
View file

@ -629,6 +629,7 @@ const ci = {
path: [ path: [
"./target", "./target",
"!./target/*/gn_out", "!./target/*/gn_out",
"!./target/*/gn_root",
"!./target/*/*.zip", "!./target/*/*.zip",
"!./target/*/*.tar.gz", "!./target/*/*.tar.gz",
].join("\n"), ].join("\n"),

1
.github/workflows/ci.yml vendored
View file

@ -377,6 +377,7 @@ jobs:
path: |- path: |-
./target ./target
!./target/*/gn_out !./target/*/gn_out
!./target/*/gn_root
!./target/*/*.zip !./target/*/*.zip
!./target/*/*.tar.gz !./target/*/*.tar.gz
key: never_saved key: never_saved

116
Cargo.lock generated
View file

@ -736,7 +736,7 @@ dependencies = [
"flaky_test", "flaky_test",
"http 1.1.0", "http 1.1.0",
"http-body-util", "http-body-util",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-util", "hyper-util",
"nix 0.26.2", "nix 0.26.2",
"once_cell", "once_cell",
@ -1336,9 +1336,9 @@ dependencies = [
[[package]] [[package]]
name = "deno_core" name = "deno_core"
version = "0.293.0" version = "0.294.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca4618658ef613af8978a4bada32231c6c31aeeb9a02b6c58a5df17168a082be" checksum = "8e3e1883573cace82d1e826096c8c06bd5e4310ca3a4dba0eb1bf67468719c01"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bincode", "bincode",
@ -1562,7 +1562,7 @@ dependencies = [
"http-body-util", "http-body-util",
"httparse", "httparse",
"hyper 0.14.28", "hyper 0.14.28",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-util", "hyper-util",
"itertools", "itertools",
"memmem", "memmem",
@ -1802,9 +1802,9 @@ dependencies = [
[[package]] [[package]]
name = "deno_ops" name = "deno_ops"
version = "0.169.0" version = "0.170.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2f2d01d8999f283f6c94cfcabe206a599a1471969e8974fc19eb523d8a7b91f" checksum = "c2534bce0346a6dbd6f892066b941a48297687d8755de135cef5dc15bed83214"
dependencies = [ dependencies = [
"proc-macro-rules", "proc-macro-rules",
"proc-macro2", "proc-macro2",
@ -1867,7 +1867,7 @@ dependencies = [
"http 1.1.0", "http 1.1.0",
"http-body-util", "http-body-util",
"hyper 0.14.28", "hyper 0.14.28",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-util", "hyper-util",
"libc", "libc",
"log", "log",
@ -2022,7 +2022,7 @@ dependencies = [
"h2 0.4.4", "h2 0.4.4",
"http 1.1.0", "http 1.1.0",
"http-body-util", "http-body-util",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-util", "hyper-util",
"once_cell", "once_cell",
"rustls-tokio-stream", "rustls-tokio-stream",
@ -2663,7 +2663,7 @@ checksum = "f63dd7b57f9b33b1741fa631c9522eb35d43e96dcca4a6a91d5e4ca7c93acdc1"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"http-body-util", "http-body-util",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-util", "hyper-util",
"pin-project", "pin-project",
"rand", "rand",
@ -3413,9 +3413,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "1.4.0" version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc" checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
@ -3434,19 +3434,20 @@ dependencies = [
[[package]] [[package]]
name = "hyper-rustls" name = "hyper-rustls"
version = "0.26.0" version = "0.27.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
dependencies = [ dependencies = [
"futures-util", "futures-util",
"http 1.1.0", "http 1.1.0",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-util", "hyper-util",
"rustls", "rustls",
"rustls-pki-types", "rustls-pki-types",
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
"tower-service", "tower-service",
"webpki-roots",
] ]
[[package]] [[package]]
@ -3460,7 +3461,7 @@ dependencies = [
"futures-util", "futures-util",
"http 1.1.0", "http 1.1.0",
"http-body 1.0.0", "http-body 1.0.0",
"hyper 1.4.0", "hyper 1.4.1",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
@ -5135,6 +5136,53 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "quinn"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad"
dependencies = [
"bytes",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
"rustc-hash",
"rustls",
"thiserror",
"tokio",
"tracing",
]
[[package]]
name = "quinn-proto"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe"
dependencies = [
"bytes",
"rand",
"ring",
"rustc-hash",
"rustls",
"slab",
"thiserror",
"tinyvec",
"tracing",
]
[[package]]
name = "quinn-udp"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46"
dependencies = [
"libc",
"once_cell",
"socket2",
"tracing",
"windows-sys 0.52.0",
]
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.36" version = "1.0.36"
@ -5314,9 +5362,9 @@ checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
version = "0.12.4" version = "0.12.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
dependencies = [ dependencies = [
"async-compression", "async-compression",
"base64 0.22.1", "base64 0.22.1",
@ -5327,7 +5375,7 @@ dependencies = [
"http 1.1.0", "http 1.1.0",
"http-body 1.0.0", "http-body 1.0.0",
"http-body-util", "http-body-util",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-rustls", "hyper-rustls",
"hyper-util", "hyper-util",
"ipnet", "ipnet",
@ -5337,6 +5385,7 @@ dependencies = [
"once_cell", "once_cell",
"percent-encoding", "percent-encoding",
"pin-project-lite", "pin-project-lite",
"quinn",
"rustls", "rustls",
"rustls-pemfile", "rustls-pemfile",
"rustls-pki-types", "rustls-pki-types",
@ -5525,11 +5574,12 @@ dependencies = [
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.22.4" version = "0.23.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0"
dependencies = [ dependencies = [
"log", "log",
"once_cell",
"ring", "ring",
"rustls-pki-types", "rustls-pki-types",
"rustls-webpki", "rustls-webpki",
@ -5568,9 +5618,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
[[package]] [[package]]
name = "rustls-tokio-stream" name = "rustls-tokio-stream"
version = "0.2.23" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c478c030dfd68498e6c59168d9eec4f8bead33152a5f3095ad4bdbdcea09d466" checksum = "22557157d7395bc30727745b365d923f1ecc230c4c80b176545f3f4f08c46e33"
dependencies = [ dependencies = [
"futures", "futures",
"rustls", "rustls",
@ -5580,9 +5630,9 @@ dependencies = [
[[package]] [[package]]
name = "rustls-webpki" name = "rustls-webpki"
version = "0.102.4" version = "0.102.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
dependencies = [ dependencies = [
"ring", "ring",
"rustls-pki-types", "rustls-pki-types",
@ -5844,9 +5894,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_v8" name = "serde_v8"
version = "0.202.0" version = "0.203.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d179230030f377d5a788e4adc979262d586d7da286462f98b70da7f8b8a9d0b7" checksum = "5edf75e70aeb4c6f14c606cfe2fc8b3bd43d4f79c781365c3f336f1fe4be508a"
dependencies = [ dependencies = [
"num-bigint", "num-bigint",
"serde", "serde",
@ -6660,9 +6710,9 @@ dependencies = [
[[package]] [[package]]
name = "sync_wrapper" name = "sync_wrapper"
version = "0.1.2" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
[[package]] [[package]]
name = "synstructure" name = "synstructure"
@ -6780,7 +6830,7 @@ dependencies = [
"h2 0.4.4", "h2 0.4.4",
"http 1.1.0", "http 1.1.0",
"http-body-util", "http-body-util",
"hyper 1.4.0", "hyper 1.4.1",
"hyper-util", "hyper-util",
"jsonc-parser", "jsonc-parser",
"lazy-regex", "lazy-regex",
@ -6946,9 +6996,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-rustls" name = "tokio-rustls"
version = "0.25.0" version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [ dependencies = [
"rustls", "rustls",
"rustls-pki-types", "rustls-pki-types",
@ -7444,9 +7494,9 @@ dependencies = [
[[package]] [[package]]
name = "v8" name = "v8"
version = "0.97.0" version = "0.98.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ecc402c55b363c29901bdd0613c68213b01c5b2a3ee362d5e985cb74901b472" checksum = "feb252d5be11c32cb4755d66d58db30ff30af5f1f17183e83ff54383a402c5f6"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"bitflags 2.5.0", "bitflags 2.5.0",

10
Cargo.toml
View file

@ -44,7 +44,7 @@ repository = "https://github.com/denoland/deno"
[workspace.dependencies] [workspace.dependencies]
deno_ast = { version = "=0.40.0", features = ["transpiling"] } deno_ast = { version = "=0.40.0", features = ["transpiling"] }
deno_core = { version = "0.293.0" } deno_core = { version = "0.294.0" }
deno_bench_util = { version = "0.155.0", path = "./bench_util" } deno_bench_util = { version = "0.155.0", path = "./bench_util" }
deno_lockfile = "0.20.0" deno_lockfile = "0.20.0"
@ -118,7 +118,7 @@ http = "1.0"
http-body-util = "0.1" http-body-util = "0.1"
http_v02 = { package = "http", version = "0.2.9" } http_v02 = { package = "http", version = "0.2.9" }
httparse = "1.8.0" httparse = "1.8.0"
hyper = { version = "=1.4.0", features = ["full"] } hyper = { version = "=1.4.1", features = ["full"] }
hyper-util = { version = "=0.1.6", features = ["tokio", "server", "server-auto"] } hyper-util = { version = "=0.1.6", features = ["tokio", "server", "server-auto"] }
hyper_v014 = { package = "hyper", version = "0.14.26", features = ["runtime", "http1"] } hyper_v014 = { package = "hyper", version = "0.14.26", features = ["runtime", "http1"] }
indexmap = { version = "2", features = ["serde"] } indexmap = { version = "2", features = ["serde"] }
@ -146,12 +146,12 @@ prost = "0.11"
prost-build = "0.11" prost-build = "0.11"
rand = "=0.8.5" rand = "=0.8.5"
regex = "^1.7.0" regex = "^1.7.0"
reqwest = { version = "=0.12.4", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks", "json", "http2"] } # pinned because of https://github.com/seanmonstar/reqwest/pull/1955 reqwest = { version = "=0.12.5", default-features = false, features = ["rustls-tls", "stream", "gzip", "brotli", "socks", "json", "http2"] } # pinned because of https://github.com/seanmonstar/reqwest/pull/1955
ring = "^0.17.0" ring = "^0.17.0"
rusqlite = { version = "=0.29.0", features = ["unlock_notify", "bundled"] } rusqlite = { version = "=0.29.0", features = ["unlock_notify", "bundled"] }
rustls = "0.22.4" rustls = { version = "0.23.11", default-features = false, features = ["logging", "std", "tls12", "ring"] }
rustls-pemfile = "2" rustls-pemfile = "2"
rustls-tokio-stream = "=0.2.23" rustls-tokio-stream = "=0.3.0"
rustls-webpki = "0.102" rustls-webpki = "0.102"
rustyline = "=13.0.0" rustyline = "=13.0.0"
saffron = "=0.1.0" saffron = "=0.1.0"

5
ext/node/ops/vm_internal.rs
View file

@ -119,7 +119,7 @@ impl ContextifyContext {
unsafe { unsafe {
v8_context.set_aligned_pointer_in_embedder_data( v8_context.set_aligned_pointer_in_embedder_data(
3, 3,
ptr.borrow().unwrap() as *const ContextifyContext as _, &*ptr.unwrap() as *const ContextifyContext as _,
); );
} }
@ -142,11 +142,10 @@ impl ContextifyContext {
.get_private(scope, private_symbol) .get_private(scope, private_symbol)
.and_then(|wrapper| { .and_then(|wrapper| {
deno_core::cppgc::try_unwrap_cppgc_object::<Self>(scope, wrapper) deno_core::cppgc::try_unwrap_cppgc_object::<Self>(scope, wrapper)
.borrow()
// SAFETY: the lifetime of the scope does not actually bind to // SAFETY: the lifetime of the scope does not actually bind to
// the lifetime of this reference at all, but the object we read // the lifetime of this reference at all, but the object we read
// it from does, so it will be alive at least that long. // it from does, so it will be alive at least that long.
.map(|r| unsafe { &*(r as *const _) }) .map(|r| unsafe { &*(&*r as *const _) })
}) })
} }