Skip to content

Commit

Permalink
Upgrade even more dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
fredizzimo committed Dec 23, 2024
1 parent 316cdd0 commit 3f29d95
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 46 deletions.
100 changes: 63 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -64,15 +64,15 @@ 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",
"manual-lifetime",
"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"
Expand All @@ -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"] }
Expand Down
10 changes: 8 additions & 2 deletions src/units.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ impl<T: Scalar> Mul<GridScale> for GridRect<T> {

#[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(),
)
}
}

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

#[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(),
)
}
}

0 comments on commit 3f29d95

Please sign in to comment.