Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use anyhow more idiomatically (#31052)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

27
crates/extension_cli/src/main.rs
View file

@ -6,7 +6,7 @@ use std::process::Command;
use std::sync::Arc;
use ::fs::{CopyOptions, Fs, RealFs, copy_recursive};
use anyhow::{Context, Result, anyhow, bail};
use anyhow::{Context as _, Result, bail};
use clap::Parser;
use extension::ExtensionManifest;
use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};
@ -107,7 +107,7 @@ async fn main() -> Result<()> {
schema_version: Some(manifest.schema_version.0),
repository: manifest
.repository
.ok_or_else(|| anyhow!("missing repository in extension manifest"))?,
.context("missing repository in extension manifest")?,
wasm_api_version: manifest.lib.version.map(|version| version.to_string()),
provides: extension_provides,
})?;
@ -196,11 +196,7 @@ async fn copy_extension_resources(
for theme_path in &manifest.themes {
fs::copy(
extension_path.join(theme_path),
output_themes_dir.join(
theme_path
.file_name()
.ok_or_else(|| anyhow!("invalid theme path"))?,
),
output_themes_dir.join(theme_path.file_name().context("invalid theme path")?),
)
.with_context(|| format!("failed to copy theme '{}'", theme_path.display()))?;
}
@ -215,7 +211,7 @@ async fn copy_extension_resources(
output_icon_themes_dir.join(
icon_theme_path
.file_name()
.ok_or_else(|| anyhow!("invalid icon theme path"))?,
.context("invalid icon theme path")?,
),
)
.with_context(|| {
@ -245,11 +241,8 @@ async fn copy_extension_resources(
copy_recursive(
fs.as_ref(),
&extension_path.join(language_path),
&output_languages_dir.join(
language_path
.file_name()
.ok_or_else(|| anyhow!("invalid language path"))?,
),
&output_languages_dir
.join(language_path.file_name().context("invalid language path")?),
CopyOptions {
overwrite: true,
ignore_if_exists: false,
@ -300,7 +293,7 @@ fn test_languages(
Some(
grammars
.get(name.as_ref())
.ok_or_else(|| anyhow!("grammar not found: '{name}'"))?,
.with_context(|| format!("grammar not found: '{name}'"))?,
)
} else {
None
@ -311,12 +304,12 @@ fn test_languages(
let entry = entry?;
let query_path = entry.path();
if query_path.extension() == Some("scm".as_ref()) {
let grammar = grammar.ok_or_else(|| {
anyhow!(
let grammar = grammar.with_context(|| {
format! {
"language {} provides query {} but no grammar",
config.name,
query_path.display()
)
}
})?;
let query_source = fs::read_to_string(&query_path)?;