language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-15 10:12:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't panic if unable to identify host in metrics

Browse source
This commit is contained in:
jackh726 2025-08-13 19:49:59 +00:00
parent 7af2dd9704
commit 65d12c4bab
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xtask/src/metrics.rs
View file

@ -160,7 +160,7 @@ struct Host {
impl Metrics { impl Metrics {
fn new(sh: &Shell) -> anyhow::Result<Metrics> { fn new(sh: &Shell) -> anyhow::Result<Metrics> {
let host = Host::new(sh)?; let host = Host::new(sh).unwrap_or_else(|_| Host::unknown());
let timestamp = SystemTime::now(); let timestamp = SystemTime::now();
let revision = cmd!(sh, "git rev-parse HEAD").read()?; let revision = cmd!(sh, "git rev-parse HEAD").read()?;
let perf_revision = "a584462e145a0c04760fd9391daefb4f6bd13a99".into(); let perf_revision = "a584462e145a0c04760fd9391daefb4f6bd13a99".into();
@ -191,9 +191,13 @@ impl Metrics {
} }
impl Host { impl Host {
fn unknown() -> Host {
Host { os: "unknown".into(), cpu: "unknown".into(), mem: "unknown".into() }
}
fn new(sh: &Shell) -> anyhow::Result<Host> { fn new(sh: &Shell) -> anyhow::Result<Host> {
if cfg!(not(target_os = "linux")) { if cfg!(not(target_os = "linux")) {
return Ok(Host { os: "unknown".into(), cpu: "unknown".into(), mem: "unknown".into() }); return Ok(Host::unknown());
} }
let os = read_field(sh, "/etc/os-release", "PRETTY_NAME=")?.trim_matches('"').to_owned(); let os = read_field(sh, "/etc/os-release", "PRETTY_NAME=")?.trim_matches('"').to_owned();