From 4750e68382dc06c934bfd50999bd71451950d682 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 23 Oct 2020 13:34:48 -0400 Subject: [PATCH 1/2] Pin git revisions of dependencies that aren't compatible in newer revisions. --- Cargo.lock | 8 ++++---- components/bluetooth/Cargo.toml | 2 +- components/webgpu/Cargo.toml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b9cbeee4633..62dbecca6cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,7 +400,7 @@ checksum = "19b23557dd27704797128f9db2816416bef20dad62d4a9768714eeb65f07d296" [[package]] name = "blurmac" version = "0.1.0" -source = "git+https://github.com/servo/devices#cb28c4725ffbfece99dab842d17d3e8c50774778" +source = "git+https://github.com/servo/devices?rev=cb28c4725ffbfece99dab842d17d3e8c50774778#cb28c4725ffbfece99dab842d17d3e8c50774778" dependencies = [ "log", "objc", @@ -1277,7 +1277,7 @@ dependencies = [ [[package]] name = "device" version = "0.0.1" -source = "git+https://github.com/servo/devices#cb28c4725ffbfece99dab842d17d3e8c50774778" +source = "git+https://github.com/servo/devices?rev=cb28c4725ffbfece99dab842d17d3e8c50774778#cb28c4725ffbfece99dab842d17d3e8c50774778" dependencies = [ "blurdroid", "blurmac", @@ -7044,7 +7044,7 @@ dependencies = [ [[package]] name = "wgpu-core" version = "0.6.0" -source = "git+https://github.com/gfx-rs/wgpu#e72724a6e393503c73f37e86aa9317a5c62e32b8" +source = "git+https://github.com/gfx-rs/wgpu?rev=e72724a6e393503c73f37e86aa9317a5c62e32b8#e72724a6e393503c73f37e86aa9317a5c62e32b8" dependencies = [ "arrayvec 0.5.1", "bitflags", @@ -7072,7 +7072,7 @@ dependencies = [ [[package]] name = "wgpu-types" version = "0.6.0" -source = "git+https://github.com/gfx-rs/wgpu#e72724a6e393503c73f37e86aa9317a5c62e32b8" +source = "git+https://github.com/gfx-rs/wgpu?rev=e72724a6e393503c73f37e86aa9317a5c62e32b8#e72724a6e393503c73f37e86aa9317a5c62e32b8" dependencies = [ "bitflags", "serde", diff --git a/components/bluetooth/Cargo.toml b/components/bluetooth/Cargo.toml index 0573265aa9c..655cd52624a 100644 --- a/components/bluetooth/Cargo.toml +++ b/components/bluetooth/Cargo.toml @@ -13,7 +13,7 @@ path = "lib.rs" [dependencies] bitflags = "1.0" bluetooth_traits = { path = "../bluetooth_traits" } -device = { git = "https://github.com/servo/devices", features = ["bluetooth-test"] } +device = { git = "https://github.com/servo/devices", features = ["bluetooth-test"], rev = "cb28c4725ffbfece99dab842d17d3e8c50774778" } embedder_traits = { path = "../embedder_traits" } ipc-channel = "0.14" log = "0.4" diff --git a/components/webgpu/Cargo.toml b/components/webgpu/Cargo.toml index cb9421e8d6b..83ad50e2287 100644 --- a/components/webgpu/Cargo.toml +++ b/components/webgpu/Cargo.toml @@ -22,5 +22,5 @@ servo_config = { path = "../config" } smallvec = { version = "0.6", features = ["serde"] } webrender_api = { git = "https://github.com/servo/webrender" } webrender_traits = { path = "../webrender_traits" } -wgpu-core = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace", "serial-pass"] } -wgpu-types = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace"] } +wgpu-core = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace", "serial-pass"], rev = "e72724a6e393503c73f37e86aa9317a5c62e32b8" } +wgpu-types = { version = "0.6.0", git = "https://github.com/gfx-rs/wgpu", features = ["replay", "trace"], rev = "e72724a6e393503c73f37e86aa9317a5c62e32b8" } From 1e3d72dc828afeee7b24b302f1f455110accfa3b Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Fri, 23 Oct 2020 13:34:54 -0400 Subject: [PATCH 2/2] Fix deprecation warnings. --- Cargo.lock | 20 +++++++++++++------- components/canvas/webgl_thread.rs | 22 +++++++++++----------- components/script/dom/htmlcanvaselement.rs | 4 ++-- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62dbecca6cb..6fd24ce1d88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2078,12 +2078,12 @@ dependencies = [ [[package]] name = "gif" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" +checksum = "02efba560f227847cb41463a7395c514d127d4f74fff12ef0137fff1b84b96c4" dependencies = [ "color_quant", - "lzw", + "weezl", ] [[package]] @@ -2510,9 +2510,9 @@ dependencies = [ [[package]] name = "half" -version = "1.0.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d68db75012a85555434ee079e7e6337931f87a087ab2988becbadf64673a7f" +checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177" [[package]] name = "harfbuzz-sys" @@ -2756,9 +2756,9 @@ dependencies = [ [[package]] name = "image" -version = "0.23.6" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b0553fec6407d63fe2975b794dfb099f3f790bdc958823851af37b26404ab4" +checksum = "985fc06b1304d19c28d5c562ed78ef5316183f2b0053b46763a0b94862373c34" dependencies = [ "bytemuck", "byteorder", @@ -7041,6 +7041,12 @@ dependencies = [ "time", ] +[[package]] +name = "weezl" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2bb9fc8309084dd7cd651336673844c1d47f8ef6d2091ec160b27f5c4aa277" + [[package]] name = "wgpu-core" version = "0.6.0" diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs index 168a7e9f070..1f2cc832007 100644 --- a/components/canvas/webgl_thread.rs +++ b/components/canvas/webgl_thread.rs @@ -2873,16 +2873,16 @@ fn image_to_tex_image_data( let mut rgbaf16 = Vec::::with_capacity(pixel_count * 8); for rgba8 in pixels.chunks(4) { rgbaf16 - .write_u16::(f16::from_f32(rgba8[0] as f32).as_bits()) + .write_u16::(f16::from_f32(rgba8[0] as f32).to_bits()) .unwrap(); rgbaf16 - .write_u16::(f16::from_f32(rgba8[1] as f32).as_bits()) + .write_u16::(f16::from_f32(rgba8[1] as f32).to_bits()) .unwrap(); rgbaf16 - .write_u16::(f16::from_f32(rgba8[2] as f32).as_bits()) + .write_u16::(f16::from_f32(rgba8[2] as f32).to_bits()) .unwrap(); rgbaf16 - .write_u16::(f16::from_f32(rgba8[3] as f32).as_bits()) + .write_u16::(f16::from_f32(rgba8[3] as f32).to_bits()) .unwrap(); } rgbaf16 @@ -2892,13 +2892,13 @@ fn image_to_tex_image_data( let mut rgbf16 = Vec::::with_capacity(pixel_count * 6); for rgba8 in pixels.chunks(4) { rgbf16 - .write_u16::(f16::from_f32(rgba8[0] as f32).as_bits()) + .write_u16::(f16::from_f32(rgba8[0] as f32).to_bits()) .unwrap(); rgbf16 - .write_u16::(f16::from_f32(rgba8[1] as f32).as_bits()) + .write_u16::(f16::from_f32(rgba8[1] as f32).to_bits()) .unwrap(); rgbf16 - .write_u16::(f16::from_f32(rgba8[2] as f32).as_bits()) + .write_u16::(f16::from_f32(rgba8[2] as f32).to_bits()) .unwrap(); } rgbf16 @@ -2906,7 +2906,7 @@ fn image_to_tex_image_data( (TexFormat::Alpha, TexDataType::HalfFloat) | (TexFormat::Alpha16f, TexDataType::HalfFloat) => { for i in 0..pixel_count { - let p = f16::from_f32(pixels[i * 4 + 3] as f32).as_bits(); + let p = f16::from_f32(pixels[i * 4 + 3] as f32).to_bits(); NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p); } pixels.truncate(pixel_count * 2); @@ -2915,7 +2915,7 @@ fn image_to_tex_image_data( (TexFormat::Luminance, TexDataType::HalfFloat) | (TexFormat::Luminance16f, TexDataType::HalfFloat) => { for i in 0..pixel_count { - let p = f16::from_f32(pixels[i * 4] as f32).as_bits(); + let p = f16::from_f32(pixels[i * 4] as f32).to_bits(); NativeEndian::write_u16(&mut pixels[i * 2..i * 2 + 2], p); } pixels.truncate(pixel_count * 2); @@ -2924,8 +2924,8 @@ fn image_to_tex_image_data( (TexFormat::LuminanceAlpha, TexDataType::HalfFloat) | (TexFormat::LuminanceAlpha16f, TexDataType::HalfFloat) => { for rgba8 in pixels.chunks_mut(4) { - let lum = f16::from_f32(rgba8[0] as f32).as_bits(); - let a = f16::from_f32(rgba8[3] as f32).as_bits(); + let lum = f16::from_f32(rgba8[0] as f32).to_bits(); + let a = f16::from_f32(rgba8[3] as f32).to_bits(); NativeEndian::write_u16(&mut rgba8[0..2], lum); NativeEndian::write_u16(&mut rgba8[2..4], a); } diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index c9060c7d8f3..67531761ce7 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/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::png::PngEncoder; use image::ColorType; use ipc_channel::ipc::{self as ipcchan, IpcSharedMemory}; use js::error::throw_type_error; @@ -426,7 +426,7 @@ impl HTMLCanvasElementMethods for HTMLCanvasElement { let mut png = Vec::new(); // FIXME(nox): https://github.com/image-rs/image-png/issues/86 // FIXME(nox): https://github.com/image-rs/image-png/issues/87 - PNGEncoder::new(&mut png) + PngEncoder::new(&mut png) .encode(&file, self.Width(), self.Height(), ColorType::Rgba8) .unwrap(); let mut url = "data:image/png;base64,".to_owned();