From 3f29d95cf5b1bf4d63da673160fd5846ba292474 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Mon, 23 Dec 2024 13:29:10 +0200 Subject: [PATCH] Upgrade even more dependencies --- Cargo.lock | 100 ++++++++++++++++++++++++++++++++------------------- Cargo.toml | 14 ++++---- src/units.rs | 10 ++++-- 3 files changed, 78 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a0dd3971..e7451ff8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -79,7 +79,7 @@ dependencies = [ "ndk-context", "ndk-sys", "num_enum", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -338,7 +338,7 @@ dependencies = [ "polling", "rustix", "slab", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -578,9 +578,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "csscolorparser" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" +checksum = "46f9a16a848a7fb95dd47ce387ac1ee9a6df879ba784b815537fcd388a1a8288" dependencies = [ "phf", ] @@ -605,9 +605,9 @@ dependencies = [ [[package]] name = "derive-new" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" +checksum = "2cdc8d50f426189eef89dac62fabfa0abb27d5cc008f25bf4156a0203325becc" dependencies = [ "proc-macro2", "quote", @@ -671,6 +671,12 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +[[package]] +name = "env_home" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" + [[package]] name = "equivalent" version = "1.0.1" @@ -729,14 +735,13 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.28.5" +version = "0.29.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca927478b3747ba47f98af6ba0ac0daea4f12d12f55e9104071b3dc00276310" +checksum = "88a5a6882b2e137c4f2664562995865084eb5a00611fba30c582ef10354c4ad8" dependencies = [ "chrono", - "glob", "log", - "thiserror", + "thiserror 2.0.9", ] [[package]] @@ -947,9 +952,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.27.0" +version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" +checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677" dependencies = [ "approx", "bytemuck", @@ -958,9 +963,9 @@ dependencies = [ [[package]] name = "glamour" -version = "0.11.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce0d37a206e319849899049d6fe5d386a2cdcbf2efc9b0b1adeb3fabed26152" +checksum = "a5c47e166d37f58b9927ac24c9b7d3e668776960871dba20018a19fb396c254f" dependencies = [ "approx", "bytemuck", @@ -1064,15 +1069,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "iana-time-zone" version = "0.1.61" @@ -1194,7 +1190,7 @@ dependencies = [ "combine", "jni-sys", "log", - "thiserror", + "thiserror 1.0.69", "walkdir", "windows-sys 0.45.0", ] @@ -1384,7 +1380,7 @@ dependencies = [ "ndk-sys", "num_enum", "raw-window-handle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2243,7 +2239,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.15", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2549,7 +2545,7 @@ dependencies = [ "log", "memmap2", "rustix", - "thiserror", + "thiserror 1.0.69", "wayland-backend", "wayland-client", "wayland-csd-frame", @@ -2670,7 +2666,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" +dependencies = [ + "thiserror-impl 2.0.9", ] [[package]] @@ -2684,6 +2689,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "time" version = "0.3.37" @@ -2855,11 +2871,12 @@ checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" [[package]] name = "tracy-client-sys" -version = "0.22.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" +checksum = "69fff37da548239c3bf9e64a12193d261e8b22b660991c6fd2df057c168f435f" dependencies = [ "cc", + "windows-targets 0.52.6", ] [[package]] @@ -3118,12 +3135,12 @@ dependencies = [ [[package]] name = "which" -version = "6.0.3" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" +checksum = "fb4a9e33648339dc1642b0e36e21b3385e6148e289226f657c809dee59df5028" dependencies = [ "either", - "home", + "env_home", "rustix", "winsafe", ] @@ -3187,7 +3204,7 @@ dependencies = [ "windows-implement", "windows-interface", "windows-result", - "windows-strings", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] @@ -3215,12 +3232,12 @@ dependencies = [ [[package]] name = "windows-registry" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a" dependencies = [ "windows-result", - "windows-strings", + "windows-strings 0.2.0", "windows-targets 0.52.6", ] @@ -3243,6 +3260,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.45.0" diff --git a/Cargo.toml b/Cargo.toml index 620d11883..0eb3dae9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,11 +33,11 @@ async-trait = "0.1.83" backtrace = "0.3.74" clap = { version = "4.5.23", features = ["cargo", "derive", "env", "color"] } copypasta = "0.10.1" -csscolorparser = "0.6.2" -derive-new = "0.6.0" +csscolorparser = "0.7.0" +derive-new = "0.7.0" dirs = "5.0.1" -glamour = { version = "0.11.1", features = ["serde"] } -flexi_logger = { version = "0.28.5", default-features = false } +glamour = { version = "0.15.0", features = ["serde"] } +flexi_logger = { version = "0.29.8", default-features = false } futures = "0.3.31" gl = "0.14.0" glutin = "0.32.1" @@ -64,7 +64,7 @@ time = { version = "0.3.37", features = ["macros", "formatting"] } tokio = { version = "1.42.0", features = ["full"] } tokio-util = { version = "0.7.13", features = ["compat"] } toml = "0.8.19" -tracy-client-sys = { version = "0.22.2", optional = true, default-features = false, features = [ +tracy-client-sys = { version = "0.24.3", optional = true, default-features = false, features = [ "broadcast", "delayed-init", "enable", @@ -72,7 +72,7 @@ tracy-client-sys = { version = "0.22.2", optional = true, default-features = fal "fibers", ] } unicode-segmentation = "1.12.0" -which = "6.0.3" +which = "7.0.1" winit = { version = "=0.30.7", features = ["serde"] } xdg = "2.5.2" notify-debouncer-full = "0.4.0" @@ -99,7 +99,7 @@ windows = { version = "0.58.0", features = [ "Win32_System_Threading", "Win32_UI_HiDpi", ] } -windows-registry = "0.2.0" +windows-registry = "0.3.0" [target.'cfg(not(target_os = "windows"))'.dependencies] skia-safe = { version = "0.80.1", features = ["gl", "textlayout"] } diff --git a/src/units.rs b/src/units.rs index 724d7a30c..435a31b01 100644 --- a/src/units.rs +++ b/src/units.rs @@ -101,7 +101,10 @@ impl Mul for GridRect { #[inline] fn mul(self, scale: GridScale) -> Self::Output { - PixelRect::new(*self.min.as_vector() * scale, *self.max.as_vector() * scale) + PixelRect::new( + (*self.min.as_vector() * scale).into(), + (*self.max.as_vector() * scale).into(), + ) } } @@ -138,6 +141,9 @@ impl Div for PixelRect { #[inline] fn div(self, scale: GridScale) -> Self::Output { - GridRect::new(*self.min.as_vector() / scale, *self.max.as_vector() / scale) + GridRect::new( + (*self.min.as_vector() / scale).into(), + (*self.max.as_vector() / scale).into(), + ) } }