From 149e8b4103008a8c1450c77a04e318097ddcbd22 Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Thu, 1 Feb 2024 07:15:59 -0500 Subject: [PATCH] Update some dependencies --- Cargo.toml | 12 ++++++------ core/src/keyboard/modifiers.rs | 2 +- wgpu/Cargo.toml | 2 +- winit/src/system.rs | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b1fa863491..de52cd8048 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,25 +121,25 @@ iced_widget = { version = "0.12", path = "widget" } iced_winit = { version = "0.12", path = "winit" } async-std = "1.0" -bitflags = "1.0" +bitflags = "2.0" bytemuck = { version = "1.0", features = ["derive"] } cosmic-text = "0.10" futures = "0.3" -glam = "0.24" +glam = "0.25" glyphon = "0.5" guillotiere = "0.6" half = "2.2" image = "0.24" kamadak-exif = "0.5" -kurbo = "0.9" +kurbo = "0.10" log = "0.4" lyon = "1.0" lyon_path = "1.0" num-traits = "0.2" once_cell = "1.0" -ouroboros = "0.17" +ouroboros = "0.18" palette = "0.7" -qrcode = { version = "0.12", default-features = false } +qrcode = { version = "0.13", default-features = false } raw-window-handle = "0.6" resvg = "0.36" rustc-hash = "1.0" @@ -147,7 +147,7 @@ smol = "1.0" smol_str = "0.2" softbuffer = "0.4" syntect = "5.1" -sysinfo = "0.28" +sysinfo = "0.30" thiserror = "1.0" tiny-skia = "0.11" tokio = "1.0" diff --git a/core/src/keyboard/modifiers.rs b/core/src/keyboard/modifiers.rs index bbdd827270..479fe6fb73 100644 --- a/core/src/keyboard/modifiers.rs +++ b/core/src/keyboard/modifiers.rs @@ -2,7 +2,7 @@ use bitflags::bitflags; bitflags! { /// The current state of the keyboard modifiers. - #[derive(Default)] + #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] pub struct Modifiers: u32{ /// The "shift" key. const SHIFT = 0b100; diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 1d3b57a710..4a0d89f0bb 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -17,7 +17,7 @@ all-features = true [features] geometry = ["iced_graphics/geometry", "lyon"] image = ["iced_graphics/image"] -svg = ["resvg"] +svg = ["resvg/text"] web-colors = ["iced_graphics/web-colors"] webgl = ["wgpu/webgl"] diff --git a/winit/src/system.rs b/winit/src/system.rs index d4cef60ef8..c5a5b21922 100644 --- a/winit/src/system.rs +++ b/winit/src/system.rs @@ -15,7 +15,7 @@ pub fn fetch_information( pub(crate) fn information( graphics_info: compositor::Information, ) -> Information { - use sysinfo::{CpuExt, ProcessExt, System, SystemExt}; + use sysinfo::{Process, System}; let mut system = System::new_all(); system.refresh_all(); @@ -23,14 +23,14 @@ pub(crate) fn information( let memory_used = sysinfo::get_current_pid() .and_then(|pid| system.process(pid).ok_or("Process not found")) - .map(ProcessExt::memory) + .map(Process::memory) .ok(); Information { - system_name: system.name(), - system_kernel: system.kernel_version(), - system_version: system.long_os_version(), - system_short_version: system.os_version(), + system_name: System::name(), + system_kernel: System::kernel_version(), + system_version: System::long_os_version(), + system_short_version: System::os_version(), cpu_brand: cpu.brand().into(), cpu_cores: system.physical_core_count(), memory_total: system.total_memory(),