build(deps): bump error-stack from 0.5.0 to 0.6.0 (#355)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: dependabot[bot]

Cargo.lock

@@ -18,7 +18,7 @@ cargo-config2 = "0.1.39"
 cargo_metadata = "0.23.1"
 clap = { version = "4.5.53", features = ["derive"] }
 clap-cargo = { version = "0.18.3", features = ["cargo_metadata"] }
-error-stack = "0.5.0"
+error-stack = "0.6.0"
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.145"
 
@@ -38,7 +38,7 @@ checked_conversions = "warn"
 dbg_macro = "warn"
 debug_assert_with_mut_call = "warn"
 doc_markdown = "warn"
-empty_enum = "warn"
+empty_enums = "warn"
 enum_glob_use = "warn"
 exit = "warn"
 expl_impl_clone_on_copy = "warn"
@@ -88,7 +88,6 @@ single_match_else = "warn"
 string_add_assign = "warn"
 string_add = "warn"
 string_lit_as_bytes = "warn"
-string_to_string = "warn"
 todo = "warn"
 trait_duplication_in_bounds = "warn"
 unimplemented = "warn"

Cargo.toml

@@ -1,11 +1,12 @@
 use std::borrow::Borrow;
+use std::error::Error;
 use std::ffi::OsString;
 use std::path::Path;
 use std::process::{Command, ExitCode};
 use std::{env, fmt, path};
 
 use anstream::eprintln;
-use error_stack::{Context, Result, ResultExt, ensure, report};
+use error_stack::{IntoReport, Report, ResultExt, ensure};
 
 use crate::cli::Cli;
 use crate::color::{note, warn};
@@ -27,28 +28,28 @@ impl fmt::Display for RuntimeError {
     }
 }
 
-impl Context for RuntimeError {}
+impl Error for RuntimeError {}
 
-fn main() -> Result<ExitCode, RuntimeError> {
+fn main() -> Result<ExitCode, Report<RuntimeError>> {
     setup();
 
     let Cli { cargo_cmd, ft_args, cargo_args } = Cli::parse();
     let context = RuntimeError { cargo_cmd };
 
     let config = cargo_config2::Config::load()
         .change_context(context)
-        .attach_printable("could not load cargo configuration")?;
+        .attach("could not load cargo configuration")?;
 
     let mut targets = config
         .build_target_for_cli(&ft_args.target)
         .change_context(context)
-        .attach_printable("could not select target triple")?;
+        .attach("could not select target triple")?;
 
     let target = targets.pop();
     let build_target = target.as_deref().unwrap_or(env!("TARGET_PLATFORM"));
     ensure!(
         targets.is_empty(),
-        report!(context).attach_printable("multi-target build is not supported")
+        context.into_report().attach("multi-target build is not supported")
     );
 
     let manifest_options = [
@@ -68,7 +69,7 @@ fn main() -> Result<ExitCode, RuntimeError> {
         .verbose(true)
         .exec()
         .change_context(context)
-        .attach_printable_lazy(|| {
+        .attach_with(|| {
             format!(
                 "could not run initial cargo metadata on {}",
                 manifest_path_display(ft_args.manifest.manifest_path.as_deref())
@@ -89,7 +90,7 @@ fn main() -> Result<ExitCode, RuntimeError> {
 
     ensure!(
         !selected_supported.is_empty(),
-        report!(context).attach_printable(format!(
+        context.into_report().attach(format!(
             "all selected packages {:?} are unsupported on {build_target}",
             package_names(&selected)
         ))
@@ -99,7 +100,7 @@ fn main() -> Result<ExitCode, RuntimeError> {
 
     ensure!(
         !selected_is_explicit || selected_unsupported.is_empty(),
-        report!(context).attach_printable(format!(
+        context.into_report().attach(format!(
             "selected packages {:?} are unsupported on {build_target}",
             package_names(&selected_unsupported)
         ))
@@ -126,7 +127,7 @@ fn main() -> Result<ExitCode, RuntimeError> {
     let status = command
         .status()
         .change_context(context)
-        .attach_printable_lazy(|| format!("could not run {command:?}"))?;
+        .attach_with(|| format!("could not run {command:?}"))?;
 
     Ok(status.code().map_or(ExitCode::FAILURE, |code| ExitCode::from(code as u8)))
 }

src/main.rs

@@ -1,8 +1,9 @@
+use std::error::Error;
 use std::fmt;
 
 use anstream::eprintln;
 use cargo_metadata::{Metadata, Package};
-use error_stack::{Context, Result, ResultExt};
+use error_stack::{Report, ResultExt};
 
 use crate::color::warn;
 use crate::package::metadata::{FtWorkspaceMetadata, ParseMetadataError};
@@ -28,7 +29,7 @@ impl fmt::Display for PackageMetadataError {
     }
 }
 
-impl Context for PackageMetadataError {}
+impl Error for PackageMetadataError {}
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct FtPackage<'p> {
@@ -40,7 +41,7 @@ impl<'p> FtPackage<'p> {
     pub fn parse_metadata(
         metadata: &Metadata,
         packages: &[&'p Package],
-    ) -> Result<Vec<Self>, PackageMetadataError> {
+    ) -> Result<Vec<Self>, Report<PackageMetadataError>> {
         let context = PackageMetadataError::from;
 
         let workspace_metadata = FtWorkspaceMetadata::parse(metadata.workspace_metadata.clone())

src/package.rs

@@ -1,13 +1,14 @@
+use std::error::Error;
 use std::fmt;
 
-use error_stack::{Context, ResultExt, report};
+use error_stack::{IntoReport, Report, ResultExt};
 use serde::de::{MapAccess, SeqAccess};
 use serde::{Deserialize, Deserializer, de};
 
 #[cfg(test)]
 mod tests;
 
-type MetadataResult<T> = error_stack::Result<T, ParseMetadataError>;
+type MetadataResult<T> = Result<T, Report<ParseMetadataError>>;
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 pub enum ParseMetadataError {
@@ -24,7 +25,7 @@ impl fmt::Display for ParseMetadataError {
     }
 }
 
-impl Context for ParseMetadataError {}
+impl Error for ParseMetadataError {}
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash, Default)]
 pub struct FtWorkspaceMetadata {
@@ -56,17 +57,17 @@ impl FtMetadata {
             serde_json::from_value::<Option<JsonPackageMetadata>>(package_metadata)
                 .change_context(ParseMetadataError::Invalid)?
                 .ok_or(ParseMetadataError::Missing)
-                .attach_printable("no `package.metadata` table")?;
+                .attach("no `package.metadata` table")?;
 
         let ft = package_metadata
             .ft
             .ok_or(ParseMetadataError::Missing)
-            .attach_printable("no `package.metadata.ft` table")?;
+            .attach("no `package.metadata.ft` table")?;
 
         let targets = ft
             .targets
             .ok_or(ParseMetadataError::Missing)
-            .attach_printable("no `package.metadata.ft.targets` array")?
+            .attach("no `package.metadata.ft.targets` array")?
             .resolve("targets", || workspace_metadata.fields.targets())?;
 
         Ok(Self { targets })
@@ -95,8 +96,8 @@ impl InheritableFields {
         self.targets
             .as_ref()
             .cloned()
-            .ok_or(report!(ParseMetadataError::Invalid))
-            .attach_printable("`workspace.metadata.ft.targets` was not defined")
+            .ok_or(ParseMetadataError::Invalid.into_report())
+            .attach("`workspace.metadata.ft.targets` was not defined")
     }
 }
 
@@ -169,7 +170,7 @@ impl<T> MaybeWorkspace<T> {
     ) -> MetadataResult<T> {
         match self {
             Self::Defined(value) => Ok(value),
-            Self::Workspace => get_workspace_inheritable().attach_printable_lazy(|| format!("error inheriting `{label}` from workspace root manifest's `workspace.metadata.ft.{label}`")),
+            Self::Workspace => get_workspace_inheritable().attach_with(|| format!("error inheriting `{label}` from workspace root manifest's `workspace.metadata.ft.{label}`")),
         }
     }
 }