Use anyhow more idiomatically (#31052)

https://github.com/zed-industries/zed/issues/30972 brought up another
case where our context is not enough to track the actual source of the
issue: we get a general top-level error without inner error.

The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD
SHA"))?; ` on the top level.

The PR finally reworks the way we use anyhow to reduce such issues (or
at least make it simpler to bubble them up later in a fix).
On top of that, uses a few more anyhow methods for better readability.

* `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error
conversion/option reporting cases are replaced with `context` and
`with_context` calls
* in addition to that, various `anyhow!("failed to do ...")` are
stripped with `.context("Doing ...")` messages instead to remove the
parasitic `failed to` text
* `anyhow::ensure!` is used instead of `if ... { return Err(...); }`
calls
* `anyhow::bail!` is used instead of `return Err(anyhow!(...));`

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2025-05-21 02:06:07 +03:00 committed by GitHub
parent 1e51a7ac44
commit 16366cf9f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
294 changed files with 2037 additions and 2610 deletions

View file

@ -91,7 +91,7 @@ impl SupermavenAdminApi {
if error.message == "User not found" {
return Ok(None);
} else {
return Err(anyhow!("Supermaven API error: {}", error.message));
anyhow::bail!("Supermaven API error: {}", error.message);
}
} else if response.status().is_server_error() {
let error: SupermavenApiError = serde_json::from_slice(&body)?;
@ -155,7 +155,7 @@ impl SupermavenAdminApi {
if error.message == "User not found" {
return Ok(());
} else {
return Err(anyhow!("Supermaven API error: {}", error.message));
anyhow::bail!("Supermaven API error: {}", error.message);
}
} else if response.status().is_server_error() {
let error: SupermavenApiError = serde_json::from_slice(&body)?;
@ -204,7 +204,7 @@ pub async fn latest_release(
if response.status().is_client_error() || response.status().is_server_error() {
let body_str = std::str::from_utf8(&body)?;
let error: SupermavenApiError = serde_json::from_str(body_str)?;
return Err(anyhow!("Supermaven API error: {}", error.message));
anyhow::bail!("Supermaven API error: {}", error.message);
}
serde_json::from_slice::<SupermavenDownloadResponse>(&body)
@ -239,13 +239,13 @@ pub async fn get_supermaven_agent_path(client: Arc<dyn HttpClient>) -> Result<Pa
"macos" => "darwin",
"windows" => "windows",
"linux" => "linux",
_ => return Err(anyhow!("unsupported platform")),
unsupported => anyhow::bail!("unsupported platform {unsupported}"),
};
let arch = match std::env::consts::ARCH {
"x86_64" => "amd64",
"aarch64" => "arm64",
_ => return Err(anyhow!("unsupported architecture")),
unsupported => anyhow::bail!("unsupported architecture {unsupported}"),
};
let download_info = latest_release(client.clone(), platform, arch).await?;