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:
parent
1e51a7ac44
commit
16366cf9f2
294 changed files with 2037 additions and 2610 deletions
|
@ -1,4 +1,4 @@
|
|||
use anyhow::Result;
|
||||
use anyhow::{Context as _, Result};
|
||||
use collections::FxHashMap;
|
||||
use gpui::SharedString;
|
||||
use schemars::{JsonSchema, r#gen::SchemaSettings};
|
||||
|
@ -147,9 +147,7 @@ impl DebugRequest {
|
|||
}
|
||||
|
||||
pub fn from_proto(val: proto::DebugRequest) -> Result<DebugRequest> {
|
||||
let request = val
|
||||
.request
|
||||
.ok_or_else(|| anyhow::anyhow!("Missing debug request"))?;
|
||||
let request = val.request.context("Missing debug request")?;
|
||||
match request {
|
||||
proto::debug_request::Request::DebugLaunchRequest(proto::DebugLaunchRequest {
|
||||
program,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use anyhow::{Context, bail};
|
||||
use anyhow::{Context as _, bail};
|
||||
use collections::{HashMap, HashSet};
|
||||
use schemars::{JsonSchema, r#gen::SchemaSettings};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
use std::path::PathBuf;
|
||||
|
||||
use anyhow::anyhow;
|
||||
use anyhow::Context as _;
|
||||
use collections::HashMap;
|
||||
use gpui::SharedString;
|
||||
use serde::Deserialize;
|
||||
|
@ -53,9 +53,9 @@ impl VsCodeDebugTaskDefinition {
|
|||
request: match self.request {
|
||||
Request::Launch => {
|
||||
let cwd = self.cwd.map(|cwd| PathBuf::from(replacer.replace(&cwd)));
|
||||
let program = self.program.ok_or_else(|| {
|
||||
anyhow!("vscode debug launch configuration does not define a program")
|
||||
})?;
|
||||
let program = self
|
||||
.program
|
||||
.context("vscode debug launch configuration does not define a program")?;
|
||||
let program = replacer.replace(&program);
|
||||
let args = self
|
||||
.args
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue