Skip to content

Commit

Permalink
Undo Memory Fix. undo web-time
Browse files Browse the repository at this point in the history
  • Loading branch information
wyatt-herkamp committed Feb 1, 2024
1 parent 13c9adf commit 951e3fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ iced_widget = { version = "0.12", path = "widget" }
iced_winit = { version = "0.12", path = "winit" }

async-std = "1.0"
bitflags = "2.4"
bitflags = "2.0"
bytemuck = { version = "1.0", features = ["derive"] }
cosmic-text = "0.10"
futures = "0.3"
Expand Down Expand Up @@ -157,7 +157,7 @@ unicode-segmentation = "1.0"
wasm-bindgen-futures = "0.4"
wasm-timer = "0.2"
web-sys = "0.3"
web-time = "1.0"
web-time = "0.2"
wgpu = "0.19"
winapi = "0.3"
window_clipboard = "0.4"
Expand Down
4 changes: 2 additions & 2 deletions winit/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub(crate) fn information(

let memory_used = sysinfo::get_current_pid()
.and_then(|pid| system.process(pid).ok_or("Process not found"))
.map(|v| v.memory() / 1000)
.map(|v| v.memory())

Check failure on line 26 in winit/src/system.rs

View workflow job for this annotation

GitHub Actions / all

redundant closure
.ok();

Information {
Expand All @@ -33,7 +33,7 @@ pub(crate) fn information(
system_short_version: System::os_version(),
cpu_brand: cpu.brand().into(),
cpu_cores: system.physical_core_count(),
memory_total: system.total_memory() / 1000,
memory_total: system.total_memory(),
memory_used,
graphics_adapter: graphics_info.adapter,
graphics_backend: graphics_info.backend,
Expand Down

0 comments on commit 951e3fb

Please sign in to comment.