aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock369
-rw-r--r--Cargo.toml6
-rw-r--r--components/rand/Cargo.toml4
-rw-r--r--components/servo/Cargo.toml1
-rw-r--r--ports/winit/Cargo.toml1
-rw-r--r--servo-tidy.toml14
6 files changed, 71 insertions, 324 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 0ae289b01fa..a1974191afe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,7 +54,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
"once_cell",
"version_check",
]
@@ -326,7 +326,7 @@ dependencies = [
"cc",
"cfg-if 1.0.0",
"libc",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
"object",
"rustc-demangle",
]
@@ -434,32 +434,11 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
[[package]]
name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
dependencies = [
- "generic-array 0.14.4",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
+ "generic-array",
]
[[package]]
@@ -591,12 +570,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28346c117b50270785fbc123bd6e4ecad20d0c6d5f43d081dc80a3abcc62be64"
[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
name = "bytemuck"
version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -624,16 +597,6 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
-[[package]]
-name = "bytes"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
@@ -946,7 +909,7 @@ version = "4.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062"
dependencies = [
- "bytes 1.1.0",
+ "bytes",
"memchr",
]
@@ -962,7 +925,7 @@ dependencies = [
"fnv",
"gfx_traits",
"gleam",
- "image 0.24.6",
+ "image",
"ipc-channel",
"keyboard-types",
"libc",
@@ -1233,7 +1196,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
dependencies = [
- "generic-array 0.14.4",
+ "generic-array",
"typenum",
]
@@ -1362,16 +1325,6 @@ dependencies = [
]
[[package]]
-name = "deflate"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
-[[package]]
name = "deny_public_fields"
version = "0.0.1"
dependencies = [
@@ -1459,20 +1412,11 @@ dependencies = [
[[package]]
name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
- "block-buffer 0.10.2",
+ "block-buffer",
"crypto-common",
]
@@ -1777,19 +1721,13 @@ dependencies = [
"flume",
"half",
"lebe",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
"rayon-core",
"smallvec",
"zune-inflate",
]
[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
name = "fastrand"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1820,7 +1758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
dependencies = [
"crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
]
[[package]]
@@ -2104,15 +2042,6 @@ dependencies = [
[[package]]
name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
@@ -2139,17 +2068,6 @@ checksum = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05"
[[package]]
name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "getrandom"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
@@ -2676,7 +2594,7 @@ version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
dependencies = [
- "bytes 1.1.0",
+ "bytes",
"fnv",
"futures-core",
"futures-sink",
@@ -2729,7 +2647,7 @@ checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
dependencies = [
"base64 0.13.0",
"bitflags 1.3.2",
- "bytes 1.1.0",
+ "bytes",
"headers-core",
"http",
"httpdate",
@@ -2799,7 +2717,7 @@ version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
- "bytes 1.1.0",
+ "bytes",
"fnv",
"itoa 1.0.1",
]
@@ -2810,7 +2728,7 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
dependencies = [
- "bytes 1.1.0",
+ "bytes",
"http",
"pin-project-lite",
]
@@ -2839,7 +2757,7 @@ version = "0.14.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
dependencies = [
- "bytes 1.1.0",
+ "bytes",
"futures-channel",
"futures-core",
"futures-util",
@@ -2930,21 +2848,6 @@ dependencies = [
[[package]]
name = "image"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
-dependencies = [
- "bytemuck",
- "byteorder",
- "color_quant",
- "num-iter",
- "num-rational 0.3.2",
- "num-traits",
- "png 0.16.8",
-]
-
-[[package]]
-name = "image"
version = "0.24.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
@@ -2957,7 +2860,7 @@ dependencies = [
"jpeg-decoder",
"num-rational 0.4.0",
"num-traits",
- "png 0.17.10",
+ "png",
"qoi",
"tiff",
]
@@ -3028,9 +2931,9 @@ dependencies = [
[[package]]
name = "ipc-channel"
-version = "0.16.1"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342d636452fbc2895574e0b319b23c014fd01c9ed71dcd87f6a4a8e2f948db4b"
+checksum = "fa880a385267ce3f1d466400b1b83ffb2bd9a3341f02392de5c7d528c2a307e6"
dependencies = [
"bincode",
"crossbeam-channel",
@@ -3038,11 +2941,11 @@ dependencies = [
"lazy_static",
"libc",
"mio 0.6.22",
- "rand 0.7.3",
+ "rand",
"serde",
"tempfile",
"uuid 1.4.1",
- "winapi",
+ "windows",
]
[[package]]
@@ -3785,15 +3688,6 @@ dependencies = [
[[package]]
name = "miniz_oxide"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "miniz_oxide"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
@@ -3832,18 +3726,6 @@ dependencies = [
]
[[package]]
-name = "mio-extras"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-dependencies = [
- "lazycell",
- "log",
- "mio 0.6.22",
- "slab",
-]
-
-[[package]]
name = "miow"
version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3960,7 +3842,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
]
[[package]]
@@ -4000,7 +3882,7 @@ dependencies = [
"async-tungstenite",
"base64 0.21.2",
"brotli",
- "bytes 1.1.0",
+ "bytes",
"content-security-policy",
"cookie 0.12.0",
"crossbeam-channel",
@@ -4010,7 +3892,7 @@ dependencies = [
"flate2",
"futures 0.3.5",
"futures-util",
- "generic-array 0.14.4",
+ "generic-array",
"headers",
"http",
"hyper",
@@ -4075,7 +3957,7 @@ dependencies = [
"http",
"hyper",
"hyper_serde",
- "image 0.24.6",
+ "image",
"ipc-channel",
"lazy_static",
"log",
@@ -4196,17 +4078,6 @@ dependencies = [
]
[[package]]
-name = "num-iter"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
name = "num-rational"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4219,17 +4090,6 @@ dependencies = [
[[package]]
name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
@@ -4370,12 +4230,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
name = "orbclient"
version = "0.3.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4588,7 +4442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
dependencies = [
"phf_shared",
- "rand 0.8.5",
+ "rand",
]
[[package]]
@@ -4676,18 +4530,6 @@ dependencies = [
[[package]]
name = "png"
-version = "0.16.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "deflate",
- "miniz_oxide 0.3.7",
-]
-
-[[package]]
-name = "png"
version = "0.17.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
@@ -4696,7 +4538,7 @@ dependencies = [
"crc32fast",
"fdeflate",
"flate2",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
]
[[package]]
@@ -4810,7 +4652,7 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
dependencies = [
"env_logger",
"log",
- "rand 0.8.5",
+ "rand",
]
[[package]]
@@ -4824,36 +4666,13 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
-[[package]]
-name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
]
[[package]]
@@ -4863,16 +4682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
- "rand_core 0.6.3",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
]
[[package]]
@@ -4881,25 +4691,16 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [
- "getrandom 0.2.8",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
]
[[package]]
name = "rand_isaac"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df6b0b3dc9991a10b2d91a86d1129314502169a1bf6afa67328945e02498b76"
+checksum = "fac4373cd91b4f55722c553fb0f286edbb81ef3ff6eec7b99d1898a4110a0b28"
dependencies = [
- "rand_core 0.5.1",
+ "rand_core",
]
[[package]]
@@ -4928,7 +4729,7 @@ dependencies = [
"font-kit",
"lyon_geom 0.17.7",
"pathfinder_geometry",
- "png 0.17.10",
+ "png",
"sw-composite",
"typed-arena",
]
@@ -4988,7 +4789,7 @@ version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
"redox_syscall 0.2.13",
"thiserror",
]
@@ -5202,7 +5003,7 @@ dependencies = [
"html5ever",
"http",
"hyper_serde",
- "image 0.24.6",
+ "image",
"indexmap",
"ipc-channel",
"itertools",
@@ -5488,7 +5289,7 @@ dependencies = [
"getopts",
"gleam",
"glow",
- "image 0.24.6",
+ "image",
"keyboard-types",
"lazy_static",
"libc",
@@ -5546,7 +5347,7 @@ dependencies = [
[[package]]
name = "servo-media"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"servo-media-audio",
"servo-media-player",
@@ -5558,7 +5359,7 @@ dependencies = [
[[package]]
name = "servo-media-audio"
version = "0.2.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"boxfnonce",
"byte-slice-cast",
@@ -5580,7 +5381,7 @@ dependencies = [
[[package]]
name = "servo-media-dummy"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"boxfnonce",
"ipc-channel",
@@ -5595,7 +5396,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"boxfnonce",
"byte-slice-cast",
@@ -5631,7 +5432,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer-render"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"gstreamer",
"gstreamer-video",
@@ -5641,7 +5442,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer-render-android"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"glib",
"gstreamer",
@@ -5654,7 +5455,7 @@ dependencies = [
[[package]]
name = "servo-media-gstreamer-render-unix"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"glib",
"gstreamer",
@@ -5667,7 +5468,7 @@ dependencies = [
[[package]]
name = "servo-media-player"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"ipc-channel",
"serde",
@@ -5679,7 +5480,7 @@ dependencies = [
[[package]]
name = "servo-media-streams"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"lazy_static",
"uuid 0.8.2",
@@ -5688,12 +5489,12 @@ dependencies = [
[[package]]
name = "servo-media-traits"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
[[package]]
name = "servo-media-webrtc"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"boxfnonce",
"lazy_static",
@@ -5771,7 +5572,7 @@ dependencies = [
[[package]]
name = "servo_media_derive"
version = "0.1.0"
-source = "git+https://github.com/servo/media#dedcd7b82b3a7e3595393281201fd36ea79e9d00"
+source = "git+https://github.com/servo/media#8615b5f123f908722a6dd576bf83b5338e07de71"
dependencies = [
"proc-macro2",
"quote",
@@ -5784,8 +5585,8 @@ version = "0.0.1"
dependencies = [
"lazy_static",
"log",
- "rand 0.7.3",
- "rand_core 0.5.1",
+ "rand",
+ "rand_core",
"rand_isaac",
"uuid 1.4.1",
]
@@ -5812,18 +5613,6 @@ dependencies = [
]
[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug",
-]
-
-[[package]]
name = "sha1"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5831,7 +5620,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
- "digest 0.10.6",
+ "digest",
]
[[package]]
@@ -5842,7 +5631,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
- "digest 0.10.6",
+ "digest",
]
[[package]]
@@ -6454,7 +6243,7 @@ dependencies = [
"arrayvec 0.7.4",
"bytemuck",
"cfg-if 1.0.0",
- "png 0.17.10",
+ "png",
"tiny-skia-path",
]
@@ -6524,7 +6313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
dependencies = [
"autocfg",
- "bytes 1.1.0",
+ "bytes",
"libc",
"memchr",
"mio 0.8.6",
@@ -6574,7 +6363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3"
dependencies = [
"async-stream",
- "bytes 1.1.0",
+ "bytes",
"futures-core",
"tokio",
"tokio-stream",
@@ -6586,7 +6375,7 @@ version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
dependencies = [
- "bytes 1.1.0",
+ "bytes",
"futures-core",
"futures-sink",
"pin-project-lite",
@@ -6664,12 +6453,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67"
dependencies = [
"byteorder",
- "bytes 1.1.0",
+ "bytes",
"data-encoding",
"http",
"httparse",
"log",
- "rand 0.8.5",
+ "rand",
"rustls",
"sha1",
"thiserror",
@@ -6815,7 +6604,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
]
[[package]]
@@ -6824,7 +6613,7 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
dependencies = [
- "getrandom 0.2.8",
+ "getrandom",
"serde",
]
@@ -6890,7 +6679,7 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba431ef570df1287f7f8b07e376491ad54f84d26ac473489427231e1718e1f69"
dependencies = [
- "bytes 1.1.0",
+ "bytes",
"futures-channel",
"futures-util",
"headers",
@@ -6915,12 +6704,6 @@ dependencies = [
[[package]]
name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
-[[package]]
-name = "wasi"
version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
@@ -7087,7 +6870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf9ae70f0cb12332fe144def990a9e62b20db2361b8784f879bb2814aad6c763"
dependencies = [
"base64 0.13.0",
- "bytes 1.1.0",
+ "bytes",
"cookie 0.16.2",
"http",
"log",
@@ -7113,7 +6896,7 @@ dependencies = [
"euclid",
"headers",
"http",
- "image 0.24.6",
+ "image",
"ipc-channel",
"keyboard-types",
"log",
@@ -7173,7 +6956,6 @@ name = "webrender"
version = "0.61.0"
dependencies = [
"backtrace",
- "base64 0.10.1",
"bincode",
"bitflags 1.3.2",
"build-parallel",
@@ -7189,7 +6971,6 @@ dependencies = [
"fxhash",
"gleam",
"glslopt",
- "image 0.23.14",
"lazy_static",
"libc",
"log",
@@ -7199,7 +6980,6 @@ dependencies = [
"rayon",
"ron 0.5.1",
"serde",
- "serde_json",
"sig",
"smallvec",
"svg_fmt",
@@ -7208,7 +6988,6 @@ dependencies = [
"webrender_api",
"webrender_build",
"wr_malloc_size_of",
- "ws",
]
[[package]]
@@ -7277,7 +7056,7 @@ dependencies = [
[[package]]
name = "webxr-api"
version = "0.0.1"
-source = "git+https://github.com/servo/webxr#d817d07133dac7eac0eb5f6c5b9dddc1477b535a"
+source = "git+https://github.com/servo/webxr#b29816a530a7519e30124c6e636511857c32433d"
dependencies = [
"euclid",
"ipc-channel",
@@ -7619,24 +7398,6 @@ dependencies = [
]
[[package]]
-name = "ws"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fe90c75f236a0a00247d5900226aea4f2d7b05ccc34da9e7a8880ff59b5848"
-dependencies = [
- "byteorder",
- "bytes 0.4.12",
- "httparse",
- "log",
- "mio 0.6.22",
- "mio-extras",
- "rand 0.7.3",
- "sha-1",
- "slab",
- "url",
-]
-
-[[package]]
name = "x11"
version = "2.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 2e9ed60617b..1a8066cecae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ hyper-rustls = { version = "0.24", default-features = false, features = ["webpki
hyper_serde = "0.13"
image = "0.24"
indexmap = { version = "1.0.2", features = ["std"] }
-ipc-channel = "0.16"
+ipc-channel = "0.17"
itertools = "0.8"
keyboard-types = "0.6"
lazy_static = "1.4"
@@ -56,7 +56,9 @@ parking_lot = "0.11"
percent-encoding = "2.0"
proc-macro2 = "1"
quote = "1"
-rand = "0.7"
+rand = "0.8"
+rand_core = "0.6"
+rand_isaac = "0.3"
rayon = "1"
regex = "1.1"
rustls = { version = "0.21.5", features = ["dangerous_configuration"] }
diff --git a/components/rand/Cargo.toml b/components/rand/Cargo.toml
index 97a0ce0b98e..b89846f34bb 100644
--- a/components/rand/Cargo.toml
+++ b/components/rand/Cargo.toml
@@ -14,6 +14,6 @@ path = "lib.rs"
lazy_static = { workspace = true }
log = { workspace = true }
rand = { workspace = true }
-rand_core = "0.5"
-rand_isaac = "0.2"
+rand_core = { workspace = true }
+rand_isaac = { workspace = true }
uuid = { workspace = true }
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 221efd72534..adf5e0b5c03 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -30,7 +30,6 @@ webgl_backtrace = [
"canvas/webgl_backtrace",
"canvas_traits/webgl_backtrace",
]
-webrender_debugger = ["webrender/debugger"]
xr-profile = ["canvas/xr-profile", "canvas_traits/xr-profile", "script/xr-profile", "webxr/profile"]
[dependencies]
diff --git a/ports/winit/Cargo.toml b/ports/winit/Cargo.toml
index e4603dc9a27..d2661e47be3 100644
--- a/ports/winit/Cargo.toml
+++ b/ports/winit/Cargo.toml
@@ -42,7 +42,6 @@ profilemozjs = ["libservo/profilemozjs"]
refcell_backtrace = ["libservo/refcell_backtrace"]
webdriver = ["libservo/webdriver"]
webgl_backtrace = ["libservo/webgl_backtrace"]
-webrender_debugger = ["libservo/webrender_debugger"]
xr-profile = ["libservo/xr-profile"]
[target.'cfg(not(target_os = "android"))'.dependencies]
diff --git a/servo-tidy.toml b/servo-tidy.toml
index 0e2205cc89a..2cc84585022 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -15,7 +15,6 @@ rand = [
"quickcheck", # Only used in tests
"servo_rand",
"tungstenite",
- "ws",
]
[ignore]
@@ -25,18 +24,11 @@ packages = [
"base64",
"cfg-if",
"cookie",
- "getrandom",
- "image",
"itoa",
"libloading",
- "miniz_oxide",
"num-rational",
"parking_lot",
"parking_lot_core",
- "png",
- "rand",
- "rand_chacha",
- "rand_core",
"redox_syscall",
"ron",
"time",
@@ -51,7 +43,6 @@ packages = [
"rustls-webpki",
# https://github.com/servo/servo/issues/26933
- "bytes",
"futures",
"mio",
@@ -66,11 +57,6 @@ packages = [
# https://github.com/servo/servo/pull/28236
"nix",
- # Duplicated by webrender debugger via ws
- "block-buffer",
- "digest",
- "generic-array",
-
# Duplicated by surfman/wgpu update.
"bitflags",
"windows-sys",
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-24 23:45:14 +0000