Skip to content

Commit c49b716

Browse files
authored
Merge pull request #190 from epage/sysinfo
refactor: Switch from os_info to sysinfo
2 parents 6222b66 + 3f2a777 commit c49b716

File tree

3 files changed

+94
-24
lines changed

3 files changed

+94
-24
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ uuid = { version = "1.3.0", features = ["v4"], default-features = false }
129129
serde_derive = "1.0.152"
130130
toml = { version = "0.9.0", default-features = false, features = ["display", "serde"] }
131131
serde = "1.0.152"
132-
os_info = "3.6.0"
133132
backtrace = "0.3.69"
133+
sysinfo = { version = "0.34.2", default-features = false, features = ["system"] }
134134

135135
[lints]
136136
workspace = true

src/report.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ impl Report {
4343
explanation: String,
4444
cause: String,
4545
) -> Self {
46-
let operating_system = os_info::get().to_string();
46+
let cpu_arch = sysinfo::System::cpu_arch();
47+
let operating_system =
48+
sysinfo::System::long_os_version().unwrap_or_else(|| "unknown".to_owned());
49+
let operating_system = format!("{operating_system} [{cpu_arch}]");
4750
let backtrace = render_backtrace();
4851

4952
Self {

0 commit comments

Comments
 (0)