Skip to content

Commit

Permalink
Merge pull request #2227 from wyatt-herkamp/update_depends
Browse files Browse the repository at this point in the history
Update Dependencies.
  • Loading branch information
hecrj authored Feb 9, 2024
2 parents 111c8bf + d304316 commit 0734667
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Remove `position` from `overlay::Element`. [#2226](https://github.com/iced-rs/iced/pull/2226)
- Add a capacity limit to the `GlyphCache` in `iced_tiny_skia`. [#2210](https://github.com/iced-rs/iced/pull/2210)
- Use pointer equality to speed up `PartialEq` implementation of `image::Bytes`. [#2220](https://github.com/iced-rs/iced/pull/2220)
- Update `bitflags`, `glam`, `kurbo`, `ouroboros`, `qrcode`, and `sysinfo` dependencies. [#2227](https://github.com/iced-rs/iced/pull/2227)

### Fixed
- Clipping of `TextInput` selection. [#2199](https://github.com/iced-rs/iced/pull/2199)
Expand Down Expand Up @@ -146,6 +147,7 @@ Many thanks to...
- @varbhat
- @VAWVAW
- @william-shere
- @wyatt-herkamp

## [0.10.0] - 2023-07-28
### Added
Expand Down
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,33 +121,33 @@ 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"
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"
Expand Down
2 changes: 1 addition & 1 deletion core/src/keyboard/modifiers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down
12 changes: 6 additions & 6 deletions winit/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ pub fn fetch_information<Message>(
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();

let cpu = system.global_cpu_info();

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(),
Expand Down

0 comments on commit 0734667

Please sign in to comment.