16366cf9f2
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
41 lines
1.2 KiB
Rust
41 lines
1.2 KiB
Rust
use gpui::App;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{Settings, SettingsSources};
|
|
|
|
/// The settings for the image viewer.
|
|
#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, Default)]
|
|
pub struct ImageViewerSettings {
|
|
/// The unit to use for displaying image file sizes.
|
|
///
|
|
/// Default: "binary"
|
|
#[serde(default)]
|
|
pub unit: ImageFileSizeUnit,
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, Serialize, Deserialize, JsonSchema, Default)]
|
|
#[serde(rename_all = "snake_case")]
|
|
pub enum ImageFileSizeUnit {
|
|
/// Displays file size in binary units (e.g., KiB, MiB).
|
|
#[default]
|
|
Binary,
|
|
/// Displays file size in decimal units (e.g., KB, MB).
|
|
Decimal,
|
|
}
|
|
|
|
impl Settings for ImageViewerSettings {
|
|
const KEY: Option<&'static str> = Some("image_viewer");
|
|
|
|
type FileContent = Self;
|
|
|
|
fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
|
|
SettingsSources::<Self::FileContent>::json_merge_with(
|
|
[sources.default]
|
|
.into_iter()
|
|
.chain(sources.user)
|
|
.chain(sources.server),
|
|
)
|
|
}
|
|
|
|
fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
|
|
}
|