Skip to content

Commit 3f29d95

Browse files
committed
Upgrade even more dependencies
1 parent 316cdd0 commit 3f29d95

File tree

3 files changed

+78
-46
lines changed

3 files changed

+78
-46
lines changed

Cargo.lock

Lines changed: 63 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ async-trait = "0.1.83"
3333
backtrace = "0.3.74"
3434
clap = { version = "4.5.23", features = ["cargo", "derive", "env", "color"] }
3535
copypasta = "0.10.1"
36-
csscolorparser = "0.6.2"
37-
derive-new = "0.6.0"
36+
csscolorparser = "0.7.0"
37+
derive-new = "0.7.0"
3838
dirs = "5.0.1"
39-
glamour = { version = "0.11.1", features = ["serde"] }
40-
flexi_logger = { version = "0.28.5", default-features = false }
39+
glamour = { version = "0.15.0", features = ["serde"] }
40+
flexi_logger = { version = "0.29.8", default-features = false }
4141
futures = "0.3.31"
4242
gl = "0.14.0"
4343
glutin = "0.32.1"
@@ -64,15 +64,15 @@ time = { version = "0.3.37", features = ["macros", "formatting"] }
6464
tokio = { version = "1.42.0", features = ["full"] }
6565
tokio-util = { version = "0.7.13", features = ["compat"] }
6666
toml = "0.8.19"
67-
tracy-client-sys = { version = "0.22.2", optional = true, default-features = false, features = [
67+
tracy-client-sys = { version = "0.24.3", optional = true, default-features = false, features = [
6868
"broadcast",
6969
"delayed-init",
7070
"enable",
7171
"manual-lifetime",
7272
"fibers",
7373
] }
7474
unicode-segmentation = "1.12.0"
75-
which = "6.0.3"
75+
which = "7.0.1"
7676
winit = { version = "=0.30.7", features = ["serde"] }
7777
xdg = "2.5.2"
7878
notify-debouncer-full = "0.4.0"
@@ -99,7 +99,7 @@ windows = { version = "0.58.0", features = [
9999
"Win32_System_Threading",
100100
"Win32_UI_HiDpi",
101101
] }
102-
windows-registry = "0.2.0"
102+
windows-registry = "0.3.0"
103103

104104
[target.'cfg(not(target_os = "windows"))'.dependencies]
105105
skia-safe = { version = "0.80.1", features = ["gl", "textlayout"] }

src/units.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ impl<T: Scalar> Mul<GridScale> for GridRect<T> {
101101

102102
#[inline]
103103
fn mul(self, scale: GridScale) -> Self::Output {
104-
PixelRect::new(*self.min.as_vector() * scale, *self.max.as_vector() * scale)
104+
PixelRect::new(
105+
(*self.min.as_vector() * scale).into(),
106+
(*self.max.as_vector() * scale).into(),
107+
)
105108
}
106109
}
107110

@@ -138,6 +141,9 @@ impl<T: Scalar> Div<GridScale> for PixelRect<T> {
138141

139142
#[inline]
140143
fn div(self, scale: GridScale) -> Self::Output {
141-
GridRect::new(*self.min.as_vector() / scale, *self.max.as_vector() / scale)
144+
GridRect::new(
145+
(*self.min.as_vector() / scale).into(),
146+
(*self.max.as_vector() / scale).into(),
147+
)
142148
}
143149
}

0 commit comments

Comments
 (0)