Auto merge of #28778 - servo:update-gif, r=jdm

Update various dependencies.

Closes #28773. Closes #28476. Closes #28479. Closes #28518. Closes #28516.

.github/workflows/main.yml

@@ -17,6 +17,9 @@ jobs:
     name: Build (Windows)
     runs-on: windows-2019
     steps:
+      - name: Branch check
+        if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-windows', github.ref) }}
+        run: exit 0
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
@@ -41,6 +44,9 @@ jobs:
     name: Build (Windows UWP x64)
     runs-on: windows-2019
     steps:
+      - name: Branch check
+        if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-windows', github.ref) }}
+        run: exit 0
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
@@ -66,6 +72,9 @@ jobs:
     name: Build (Windows UWP arm64)
     runs-on: windows-2019
     steps:
+      - name: Branch check
+        if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-windows', github.ref) }}
+        run: exit 0
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
@@ -89,6 +98,9 @@ jobs:
     name: Build (macOS)
     runs-on: macos-10.15
     steps:
+      - name: Branch check
+        if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-mac', github.ref) }}
+        run: exit 0
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
@@ -181,6 +193,9 @@ jobs:
     name: Build (Linux)
     runs-on: ubuntu-20.04
     steps:
+      - name: Branch check
+        if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-linux refs/heads/try-wpt', github.ref) }}
+        run: exit 0
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
@@ -214,6 +229,9 @@ jobs:
       matrix:
         chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
     steps:
+      - name: Branch check
+        if: ${{ !contains('refs/heads/auto refs/heads/try refs/heads/try-wpt', github.ref) }}
+        run: exit 0
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2

components/canvas/Cargo.toml

@@ -22,7 +22,7 @@ canvas_traits = { path = "../canvas_traits" }
 crossbeam-channel = "0.4"
 cssparser = "0.29"
 euclid = "0.20"
-font-kit = "0.10"
+font-kit = "0.11"
 fnv = "1.0"
 gfx = { path = "../gfx" }
 gleam = "0.12"
@@ -33,7 +33,7 @@ lyon_geom = "0.14"
 num-traits = "0.2"
 pathfinder_geometry = "0.5"
 pixels = { path = "../pixels" }
-raqote = { git = "https://github.com/jrmuizel/raqote", features = ["text"] }
+raqote = { git = "https://github.com/jrmuizel/raqote" }
 servo_arc = { path = "../servo_arc" }
 servo_config = { path = "../config" }
 sparkle = "0.1.25"

components/compositing/Cargo.toml

@@ -22,9 +22,9 @@ embedder_traits = { path = "../embedder_traits" }
 euclid = "0.20"
 gfx_traits = { path = "../gfx_traits" }
 gleam = { version = "0.12", optional = true }
-image = "0.23"
+image = "0.24"
 ipc-channel = "0.14"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 libc = "0.2"
 log = "0.4"
 msg = { path = "../msg" }

components/config/Cargo.toml

@@ -31,4 +31,4 @@ url = "2.0"
 std_test_override = { path = "../std_test_override" }
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
-dirs = "2.0.2"
+dirs-next = "2.0"

components/config/basedir.rs

@@ -15,7 +15,7 @@ use std::path::PathBuf;
     not(target_os = "android")
 ))]
 pub fn default_config_dir() -> Option<PathBuf> {
-    let mut config_dir = ::dirs::config_dir().unwrap();
+    let mut config_dir = ::dirs_next::config_dir().unwrap();
     config_dir.push("servo");
     config_dir.push("default");
     Some(config_dir)
@@ -30,14 +30,14 @@ pub fn default_config_dir() -> Option<PathBuf> {
 pub fn default_config_dir() -> Option<PathBuf> {
     // FIXME: use `config_dir()` ($HOME/Library/Preferences)
     // instead of `data_dir()` ($HOME/Library/Application Support) ?
-    let mut config_dir = ::dirs::data_dir().unwrap();
+    let mut config_dir = ::dirs_next::data_dir().unwrap();
     config_dir.push("Servo");
     Some(config_dir)
 }
 
 #[cfg(all(target_os = "windows", not(feature = "uwp")))]
 pub fn default_config_dir() -> Option<PathBuf> {
-    let mut config_dir = ::dirs::config_dir().unwrap();
+    let mut config_dir = ::dirs_next::config_dir().unwrap();
     config_dir.push("Servo");
     Some(config_dir)
 }

components/constellation/Cargo.toml

@@ -25,7 +25,7 @@ gfx_traits = { path = "../gfx_traits" }
 http = "0.2"
 headers = "0.3"
 ipc-channel = "0.14"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 layout_traits = { path = "../layout_traits" }
 log = "0.4"
 media = { path = "../media" }

components/embedder_traits/Cargo.toml

@@ -13,7 +13,7 @@ path = "lib.rs"
 [dependencies]
 crossbeam-channel = "0.4"
 ipc-channel = "0.14"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 lazy_static = "1"
 log = "0.4"
 msg = { path = "../msg" }

components/gfx/Cargo.toml

@@ -52,7 +52,7 @@ freetype = "0.7"
 servo_allocator = { path = "../allocator" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-servo-fontconfig = "0.5"
+fontconfig_sys = { package = "yeslogic-fontconfig-sys", version = "3" }
 
 [target.'cfg(target_os = "android")'.dependencies]
 xml-rs = "0.8"

components/gfx/platform/freetype/font_list.rs

@@ -4,14 +4,12 @@
 
 use super::c_str_to_string;
 use crate::text::util::is_cjk;
-use fontconfig::fontconfig::{FcChar8, FcResultMatch, FcSetSystem};
+use fontconfig_sys::{FcChar8, FcResultMatch, FcSetSystem};
-use fontconfig::fontconfig::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute};
+use fontconfig_sys::{FcConfigGetCurrent, FcConfigGetFonts, FcConfigSubstitute};
-use fontconfig::fontconfig::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString};
+use fontconfig_sys::{FcDefaultSubstitute, FcFontMatch, FcNameParse, FcPatternGetString};
-use fontconfig::fontconfig::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatternDestroy};
+use fontconfig_sys::{FcFontSetDestroy, FcMatchPattern, FcPatternCreate, FcPatternDestroy};
-use fontconfig::fontconfig::{
+use fontconfig_sys::{FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy, FcPatternAddString};
-    FcFontSetList, FcObjectSetCreate, FcObjectSetDestroy, FcPatternAddString,
+use fontconfig_sys::{FcObjectSetAdd, FcPatternGetInteger};
-};
-use fontconfig::fontconfig::{FcObjectSetAdd, FcPatternGetInteger};
 use libc::{c_char, c_int};
 use std::ffi::CString;
 use std::ptr;

components/layout/Cargo.toml

@@ -22,7 +22,7 @@ euclid = "0.20"
 fnv = "1.0"
 gfx = { path = "../gfx" }
 gfx_traits = { path = "../gfx_traits" }
-html5ever = "0.25"
+html5ever = "0.26"
 ipc-channel = "0.14"
 lazy_static = "1"
 libc = "0.2"
@@ -31,7 +31,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
 num-traits = "0.2"
-parking_lot = "0.10"
+parking_lot = "0.11"
 profile_traits = { path = "../profile_traits" }
 range = { path = "../range" }
 rayon = "1"

components/layout_2020/Cargo.toml

@@ -23,14 +23,14 @@ fnv = "1.0"
 fxhash = "0.2"
 gfx = { path = "../gfx" }
 gfx_traits = { path = "../gfx_traits" }
-html5ever = "0.25"
+html5ever = "0.26"
 ipc-channel = "0.14"
 libc = "0.2"
 log = "0.4"
 mitochondria = "1.1.2"
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
-parking_lot = "0.10"
+parking_lot = "0.11"
 range = { path = "../range" }
 rayon = "1"
 rayon_croissant = "0.2.0"
@@ -47,4 +47,4 @@ webrender_api = { git = "https://github.com/servo/webrender" }
 
 [dev-dependencies]
 lazy_static = "1"
-quickcheck = "0.9"
+quickcheck = "1"

components/layout_thread/Cargo.toml

@@ -21,7 +21,7 @@ fxhash = "0.2"
 gfx = { path = "../gfx" }
 gfx_traits = { path = "../gfx_traits" }
 histogram = "0.6.8"
-html5ever = "0.25"
+html5ever = "0.26"
 ipc-channel = "0.14"
 layout = { path = "../layout", package = "layout_2013" }
 layout_traits = { path = "../layout_traits" }
@@ -32,7 +32,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 metrics = { path = "../metrics" }
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
-parking_lot = { version = "0.10" }
+parking_lot = { version = "0.11" }
 profile_traits = { path = "../profile_traits" }
 range = { path = "../range" }
 rayon = "1"

components/layout_thread_2020/Cargo.toml

@@ -20,7 +20,7 @@ fnv = "1.0"
 fxhash = "0.2"
 gfx = { path = "../gfx" }
 gfx_traits = { path = "../gfx_traits" }
-html5ever = "0.25"
+html5ever = "0.26"
 ipc-channel = "0.14"
 layout = { path = "../layout_2020", package = "layout_2020" }
 layout_traits = { path = "../layout_traits" }
@@ -31,7 +31,7 @@ malloc_size_of = { path = "../malloc_size_of" }
 metrics = { path = "../metrics" }
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
-parking_lot = { version = "0.10" }
+parking_lot = { version = "0.11" }
 profile_traits = { path = "../profile_traits" }
 range = { path = "../range" }
 script = { path = "../script" }

components/malloc_size_of/Cargo.toml

@@ -35,8 +35,8 @@ cssparser = "0.29"
 euclid = "0.20"
 hashglobe = { path = "../hashglobe" }
 http = { version = "0.2", optional = true }
-hyper_serde = { version = "0.12", optional = true }
+hyper_serde = { version = "0.13", optional = true }
-keyboard-types = { version = "0.5", optional = true }
+keyboard-types = { version = "0.6", optional = true }
 selectors = { path = "../selectors" }
 serde = { version = "1.0.27", optional = true }
 serde_bytes = { version = "0.11", optional = true }
@@ -51,4 +51,4 @@ url = { version = "2.0", optional = true }
 uuid = { version = "0.8", features = ["v4"], optional = true }
 void = "1.0.2"
 webrender_api = { git = "https://github.com/servo/webrender", optional = true }
-xml5ever = { version = "0.16", optional = true }
+xml5ever = { version = "0.17", optional = true }

components/msg/Cargo.toml

@@ -17,7 +17,7 @@ ipc-channel = "0.14"
 lazy_static = "1"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = "0.1"
-parking_lot = "0.10"
+parking_lot = "0.11"
 serde = "1.0.60"
 webrender_api = { git = "https://github.com/servo/webrender" }
 

components/net/Cargo.toml

@@ -21,7 +21,7 @@ base64 = "0.10.1"
 brotli = "3"
 bytes = "1"
 content-security-policy = { version = "0.4.0", features = ["serde"] }
-cookie_rs = { package = "cookie", version = "0.11" }
+cookie_rs = { package = "cookie", version = "0.12" }
 crossbeam-channel = "0.4"
 data-url = "0.1.0"
 devtools_traits = { path = "../devtools_traits" }
@@ -33,7 +33,7 @@ headers = "0.3"
 http = "0.2"
 hyper = { version = "0.14", features = ["client", "http1", "http2", "tcp", "stream"] }
 hyper-openssl = "0.9.1"
-hyper_serde = "0.12"
+hyper_serde = "0.13"
 immeta = "0.4"
 ipc-channel = "0.14"
 lazy_static = "1"

components/net_traits/Cargo.toml

@@ -14,12 +14,12 @@ doctest = false
 
 [dependencies]
 content-security-policy = { version = "0.4.0", features = ["serde"] }
-cookie = "0.11"
+cookie = "0.12"
 embedder_traits = { path = "../embedder_traits" }
 headers = "0.3"
 http = "0.2"
 hyper = "0.14"
-hyper_serde = "0.12"
+hyper_serde = "0.13"
 ipc-channel = "0.14"
 lazy_static = "1"
 log = "0.4"
@@ -29,7 +29,7 @@ mime = "0.3"
 msg = { path = "../msg" }
 num-traits = "0.2"
 percent-encoding = "2.0"
-piston_image = { package = "image", version = "0.23" }
+piston_image = { package = "image", version = "0.24" }
 pixels = { path = "../pixels" }
 serde = "1.0"
 servo_arc = { path = "../servo_arc" }

components/net_traits/image/base.rs

@@ -4,7 +4,7 @@
 
 use crate::image_cache::CorsStatus;
 use ipc_channel::ipc::IpcSharedMemory;
-use piston_image::{DynamicImage, ImageFormat};
+use piston_image::ImageFormat;
 use pixels::PixelFormat;
 use std::fmt;
 
@@ -52,10 +52,7 @@ pub fn load_from_memory(buffer: &[u8], cors_status: CorsStatus) -> Option<Image>
         },
         Ok(_) => match piston_image::load_from_memory(buffer) {
             Ok(image) => {
-                let mut rgba = match image {
+                let mut rgba = image.into_rgba8();
-                    DynamicImage::ImageRgba8(rgba) => rgba,
-                    image => image.to_rgba(),
-                };
                 pixels::rgba8_byte_swap_colors_inplace(&mut *rgba);
                 Some(Image {
                     width: rgba.width(),

components/script/Cargo.toml

@@ -32,7 +32,7 @@ serde_json = "1.0"
 [dependencies]
 accountable-refcell = { version = "0.2.0", optional = true }
 app_units = "0.7"
-arrayvec = "0.5.1"
+arrayvec = "0.7"
 backtrace = "0.3"
 base64 = "0.10.1"
 bitflags = "1.0"
@@ -40,7 +40,7 @@ bluetooth_traits = { path = "../bluetooth_traits" }
 canvas_traits = { path = "../canvas_traits" }
 chrono = "0.4"
 content-security-policy = { version = "0.4.0", features = ["serde"] }
-cookie = "0.11"
+cookie = "0.12"
 crossbeam-channel = "0.4"
 cssparser = "0.29"
 data-url = "0.1.0"
@@ -55,16 +55,16 @@ euclid = "0.20"
 fnv = "1.0"
 fxhash = "0.2"
 headers = "0.3"
-html5ever = "0.25"
+html5ever = "0.26"
 http = "0.2"
-hyper_serde = "0.12"
+hyper_serde = "0.13"
-image = "0.23"
+image = "0.24"
 indexmap = { version = "1.0.2", features = ["std"] }
 ipc-channel = "0.14"
 itertools = "0.8"
 js = { package = "mozjs", git = "https://github.com/servo/rust-mozjs" }
 jstraceable_derive = { path = "../jstraceable_derive" }
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 lazy_static = "1"
 libc = "0.2"
 log = "0.4"
@@ -78,7 +78,7 @@ mitochondria = "1.1.2"
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
 num-traits = "0.2"
-parking_lot = "0.10"
+parking_lot = "0.11"
 percent-encoding = "2.0"
 phf = "0.8"
 pixels = { path = "../pixels" }
@@ -116,7 +116,7 @@ webdriver = "0.44"
 webgpu = { path = "../webgpu" }
 webrender_api = { git = "https://github.com/servo/webrender" }
 webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
-xml5ever = "0.16"
+xml5ever = "0.17"
 
 [target.'cfg(not(target_os = "ios"))'.dependencies]
 mozangle = "0.2"

components/script/dom/gpucanvascontext.rs

@@ -135,7 +135,7 @@ impl GPUCanvasContextMethods for GPUCanvasContext {
         }
         *self.swap_chain.borrow_mut() = None;
 
-        let mut buffer_ids = ArrayVec::<[id::BufferId; PRESENTATION_BUFFER_COUNT]>::new();
+        let mut buffer_ids = ArrayVec::<id::BufferId, PRESENTATION_BUFFER_COUNT>::new();
         for _ in 0..PRESENTATION_BUFFER_COUNT {
             buffer_ids.push(
                 self.global()

components/script/dom/htmlcanvaselement.rs

@@ -37,7 +37,7 @@ use canvas_traits::webgl::{GLContextAttributes, WebGLVersion};
 use dom_struct::dom_struct;
 use euclid::default::{Rect, Size2D};
 use html5ever::{LocalName, Prefix};
-use image::png::PngEncoder;
+use image::codecs::png::PngEncoder;
 use image::ColorType;
 use ipc_channel::ipc::{self as ipcchan, IpcSharedMemory};
 use js::error::throw_type_error;

components/script/lib.rs

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#![feature(const_fn_fn_ptr_basics)]
-#![feature(const_fn_trait_bound)]
 #![feature(core_intrinsics)]
 #![feature(drain_filter)]
 #![feature(plugin)]

components/script_layout_interface/Cargo.toml

@@ -18,7 +18,7 @@ crossbeam-channel = "0.4"
 euclid = "0.20"
 fxhash = "0.2"
 gfx_traits = { path = "../gfx_traits" }
-html5ever = "0.25"
+html5ever = "0.26"
 ipc-channel = "0.14"
 libc = "0.2"
 malloc_size_of = { path = "../malloc_size_of" }
@@ -26,7 +26,7 @@ malloc_size_of_derive = "0.1"
 metrics = { path = "../metrics" }
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }
-parking_lot = "0.10"
+parking_lot = "0.11"
 profile_traits = { path = "../profile_traits" }
 range = { path = "../range" }
 script_traits = { path = "../script_traits" }

components/script_traits/Cargo.toml

@@ -14,7 +14,7 @@ path = "lib.rs"
 bitflags = "1.0"
 bluetooth_traits = { path = "../bluetooth_traits" }
 canvas_traits = { path = "../canvas_traits" }
-cookie = "0.11"
+cookie = "0.12"
 crossbeam-channel = "0.4"
 devtools_traits = { path = "../devtools_traits" }
 embedder_traits = { path = "../embedder_traits" }
@@ -22,9 +22,9 @@ euclid = "0.20"
 gfx_traits = { path = "../gfx_traits" }
 headers = "0.3"
 http = "0.2"
-hyper_serde = "0.12"
+hyper_serde = "0.13"
 ipc-channel = "0.14"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 libc = "0.2"
 log = "0.4"
 malloc_size_of = { path = "../malloc_size_of" }

components/servo/Cargo.toml

@@ -56,7 +56,7 @@ gfx_traits = { path = "../gfx_traits" }
 gleam = "0.12"
 gstreamer = { version = "0.15", features = ["v1_16"], optional = true }
 ipc-channel = "0.14"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 layout_thread_2013 = { path = "../layout_thread", optional = true }
 layout_thread_2020 = { path = "../layout_thread_2020", optional = true }
 log = "0.4"

components/style/Cargo.toml

@@ -31,7 +31,7 @@ gecko_profiler = []
 
 [dependencies]
 app_units = "0.7"
-arrayvec = "0.5"
+arrayvec = "0.7"
 atomic_refcell = "0.1"
 bitflags = "1.0"
 byteorder = "1.0"
@@ -42,7 +42,7 @@ euclid = "0.20"
 fallible = { path = "../fallible" }
 fxhash = "0.2"
 hashglobe = { path = "../hashglobe" }
-html5ever = { version = "0.25", optional = true }
+html5ever = { version = "0.26", optional = true }
 indexmap = "1.0"
 itertools = "0.8"
 itoa = "0.4"
@@ -56,7 +56,7 @@ num-integer = "0.1"
 num-traits = "0.2"
 num_cpus = { version = "1.1.0", optional = true }
 owning_ref = "0.4"
-parking_lot = "0.10"
+parking_lot = "0.11"
 precomputed-hash = "0.1.1"
 rayon = "1"
 selectors = { path = "../selectors" }

components/style/parallel.rs

@@ -69,7 +69,7 @@ pub const WORK_UNIT_MAX: usize = 16;
 
 /// A set of nodes, sized to the work unit. This gets copied when sent to other
 /// threads, so we keep it compact.
-type WorkUnit<N> = ArrayVec<[SendNode<N>; WORK_UNIT_MAX]>;
+type WorkUnit<N> = ArrayVec<SendNode<N>, WORK_UNIT_MAX>;
 
 /// A callback to create our thread local context.  This needs to be
 /// out of line so we don't allocate stack space for the entire struct

components/style/properties/properties.mako.rs

@@ -2534,11 +2534,9 @@ impl PropertyDeclaration {
     }
 }
 
-type SubpropertiesArray<T> =
+type SubpropertiesVec<T> = ArrayVec<T, ${max(len(s.sub_properties) \
-    [T; ${max(len(s.sub_properties) for s in data.shorthands_except_all()) \
+    for s in data.shorthands_except_all()) \
-          if data.shorthands_except_all() else 0}];
+          if data.shorthands_except_all() else 0}>;
-
-type SubpropertiesVec<T> = ArrayVec<SubpropertiesArray<T>>;
 
 /// A stack-allocated vector of `PropertyDeclaration`
 /// large enough to parse one CSS `key: value` declaration.
@@ -2594,7 +2592,11 @@ impl SourcePropertyDeclaration {
 
 /// Return type of SourcePropertyDeclaration::drain
 pub struct SourcePropertyDeclarationDrain<'a> {
-    declarations: ArrayVecDrain<'a, SubpropertiesArray<PropertyDeclaration>>,
+    declarations: ArrayVecDrain<
+        'a, PropertyDeclaration,
+        ${max(len(s.sub_properties) for s in data.shorthands_except_all()) \
+            if data.shorthands_except_all() else 0}
+    >,
     all_shorthand: AllShorthand,
 }
 

components/webdriver_server/Cargo.toml

@@ -13,14 +13,14 @@ path = "lib.rs"
 [dependencies]
 base64 = "0.10"
 compositing = { path = "../compositing" }
-cookie = "0.11"
+cookie = "0.12"
 crossbeam-channel = "0.4"
 euclid = "0.20"
 headers = "0.3"
 http = "0.2"
-image = "0.23"
+image = "0.24"
 ipc-channel = "0.14"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 log = "0.4"
 msg = { path = "../msg" }
 net_traits = { path = "../net_traits" }

components/webdriver_server/lib.rs

@@ -43,6 +43,7 @@ use servo_url::ServoUrl;
 use std::borrow::ToOwned;
 use std::collections::{BTreeMap, HashMap};
 use std::fmt;
+use std::io::Cursor;
 use std::mem;
 use std::net::{SocketAddr, SocketAddrV4};
 use std::thread;
@@ -1589,12 +1590,12 @@ impl Handler {
         );
 
         let rgb = RgbImage::from_raw(img.width, img.height, img.bytes.to_vec()).unwrap();
-        let mut png_data = Vec::new();
+        let mut png_data = Cursor::new(Vec::new());
         DynamicImage::ImageRgb8(rgb)
             .write_to(&mut png_data, ImageFormat::Png)
             .unwrap();
 
-        Ok(base64::encode(&png_data))
+        Ok(base64::encode(png_data.get_ref()))
     }
 
     fn handle_take_screenshot(&self) -> WebDriverResult<WebDriverResponse> {

components/webgpu/Cargo.toml

@@ -11,7 +11,7 @@ name = "webgpu"
 path = "lib.rs"
 
 [dependencies]
-arrayvec = { version = "0.5.1", features = ["serde"] }
+arrayvec = { version = "0.7", features = ["serde"] }
 euclid = "0.20"
 ipc-channel = "0.14"
 log = "0.4"

components/webgpu/lib.rs

@@ -164,7 +164,7 @@ pub enum WebGPURequest {
     },
     CreateSwapChain {
         device_id: id::DeviceId,
-        buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>,
+        buffer_ids: ArrayVec<id::BufferId, PRESENTATION_BUFFER_COUNT>,
         external_id: u64,
         sender: IpcSender<webrender_api::ImageKey>,
         image_desc: webrender_api::ImageDescriptor,
@@ -755,10 +755,12 @@ impl<'a> WGPU<'a> {
                                 size: Size2D::new(width, height),
                                 unassigned_buffer_ids: buffer_ids,
                                 available_buffer_ids: ArrayVec::<
-                                    [id::BufferId; PRESENTATION_BUFFER_COUNT],
+                                    id::BufferId,
+                                    PRESENTATION_BUFFER_COUNT,
                                 >::new(),
                                 queued_buffer_ids: ArrayVec::<
-                                    [id::BufferId; PRESENTATION_BUFFER_COUNT],
+                                    id::BufferId,
+                                    PRESENTATION_BUFFER_COUNT,
                                 >::new(),
                                 buffer_stride,
                                 image_key,
@@ -1366,9 +1368,9 @@ pub struct PresentationData {
     queue_id: id::QueueId,
     pub data: Vec<u8>,
     pub size: Size2D<i32>,
-    unassigned_buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>,
+    unassigned_buffer_ids: ArrayVec<id::BufferId, PRESENTATION_BUFFER_COUNT>,
-    available_buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>,
+    available_buffer_ids: ArrayVec<id::BufferId, PRESENTATION_BUFFER_COUNT>,
-    queued_buffer_ids: ArrayVec<[id::BufferId; PRESENTATION_BUFFER_COUNT]>,
+    queued_buffer_ids: ArrayVec<id::BufferId, PRESENTATION_BUFFER_COUNT>,
     buffer_stride: u32,
     image_key: webrender_api::ImageKey,
     image_desc: webrender_api::ImageDescriptor,

ports/libsimpleservo/capi/Cargo.toml

@@ -19,7 +19,7 @@ lazy_static = "1"
 log = "0.4"
 simpleservo = { path = "../api" }
 surfman = "0.4"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 libc = "0.2"

ports/libsimpleservo/jniapi/Cargo.toml

@@ -15,7 +15,7 @@ bench = false
 
 [dependencies]
 android_injected_glue = "0.2"
-android_logger = "0.8"
+android_logger = "0.10"
 gstreamer = "0.15"
 jni = "0.18.0"
 libc = "0.2"

ports/winit/Cargo.toml

@@ -50,7 +50,7 @@ backtrace = "0.3"
 clipboard = "0.5"
 euclid = "0.20"
 getopts = "0.2.11"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 lazy_static = "1"
 libc = "0.2"
 libservo = { path = "../../components/servo" }
@@ -63,7 +63,7 @@ webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow",
 winit = "0.24"
 
 [target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
-image = "0.23"
+image = "0.24"
 
 [target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
 sig = "1.0"

servo-tidy.toml

@@ -21,7 +21,6 @@ rand = [
   "quickcheck", # Only used in tests
   "servo_rand",
   "tempfile",
-  "uuid",
   "tungstenite",
   "ws",
 ]
@@ -29,18 +28,21 @@ rand = [
 [ignore]
 # Ignored packages with duplicated versions
 packages = [
+  "adler",
   "arrayvec",
   "base64",
   "cfg-if",
   "cloudabi",
   "cocoa",
-  "cookie",
   "crossbeam-channel",
   "crossbeam-utils",
-  "env_logger",
+  "deflate",
   "fixedbitset",
+  "getrandom",
   "gleam",
   "h2",
+  "image",
+  "jpeg-decoder",
   "libloading",
   "lock_api",
   "metal",
@@ -49,7 +51,17 @@ packages = [
   "parking_lot",
   "parking_lot_core",
   "petgraph",
+  "phf",
+  "phf_codegen",
+  "phf_generator",
+  "phf_shared",
+  "png",
+  "rand",
+  "rand_chacha",
+  "rand_core",
+  "redox_syscall",
   "ron",
+  "wasi",
   "wayland-sys",
 
   # https://github.com/servo/servo/issues/26933

tests/unit/script/Cargo.toml

@@ -11,6 +11,6 @@ path = "lib.rs"
 
 [dependencies]
 euclid = "0.20"
-keyboard-types = "0.5"
+keyboard-types = "0.6"
 script = {path = "../../../components/script"}
 servo_url = {path = "../../../components/url"}

tests/unit/style/Cargo.toml

@@ -13,7 +13,7 @@ doctest = false
 app_units = "0.7"
 cssparser = "0.29"
 euclid = "0.20"
-html5ever = "0.25"
+html5ever = "0.26"
 rayon = "1"
 serde_json = "1.0"
 selectors = {path = "../../../components/selectors"}