error: Move to diagnostics

fischeti · fischeti · commit af269e3f79ac · 2026-02-27T14:56:06.000+01:00
diff --git a/src/bin/bender.rs b/src/bin/bender.rs
@@ -3,7 +3,7 @@
 
 fn main() {
     if let Err(e) = bender::cli::main() {
-        bender::diagnostic::Diagnostics::eprintln(&format!("{e:?}"));
+        eprintln!("{e:?}");
         std::process::exit(1);
     }
 }
diff --git a/src/cli.rs b/src/cli.rs
@@ -21,13 +21,13 @@ use miette::{Context as _, IntoDiagnostic as _};
 use serde_yaml_ng;
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::cmd;
 use crate::cmd::fusesoc::FusesocArgs;
 use crate::config::{
     Config, Manifest, Merge, PartialConfig, PrefixPaths, Validate, ValidationContext,
 };
-use crate::diagnostic::{Diagnostics, Warnings};
-use crate::error::*;
+use crate::diagnostic::{Diagnostics, ENABLE_DEBUG, Warnings};
 use crate::lockfile::*;
 use crate::sess::{Session, SessionArenas, SessionIo};
 use crate::{bail, err};
diff --git a/src/cmd/audit.rs b/src/cmd/audit.rs
@@ -13,8 +13,8 @@ use semver::VersionReq;
 use tabwriter::TabWriter;
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::cmd::parents::get_parent_array;
-use crate::error::*;
 use crate::sess::{DependencyVersions, Session, SessionIo};
 
 /// Get information about version conflicts and possible updates.
diff --git a/src/cmd/checkout.rs b/src/cmd/checkout.rs
@@ -7,7 +7,7 @@ use clap::Args;
 use miette::IntoDiagnostic as _;
 use tokio::runtime::Runtime;
 
-use crate::error::*;
+use crate::Result;
 use crate::fmt_dim;
 use crate::infoln;
 use crate::sess::{Session, SessionIo};
diff --git a/src/cmd/clean.rs b/src/cmd/clean.rs
@@ -6,7 +6,7 @@ use std::path::Path;
 use miette::{Context as _, IntoDiagnostic as _};
 use std::fs;
 
-use crate::error::*;
+use crate::Result;
 use crate::infoln;
 use crate::sess::Session;
 
diff --git a/src/cmd/clone.rs b/src/cmd/clone.rs
@@ -11,12 +11,12 @@ use indexmap::IndexMap;
 use miette::{Context as _, IntoDiagnostic as _};
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::bail;
 use crate::cli::{remove_symlink_dir, symlink_dir};
 use crate::config;
 use crate::config::{Locked, LockedSource};
 use crate::diagnostic::Warnings;
-use crate::error::*;
 use crate::infoln;
 use crate::sess::{DependencyRef, DependencySource, Session, SessionIo};
 use crate::{debugln, fmt_path, fmt_pkg, stageln};
diff --git a/src/cmd/completion.rs b/src/cmd/completion.rs
@@ -5,7 +5,7 @@
 
 use std::io;
 
-use crate::error::*;
+use crate::Result;
 use clap::{Args, Command};
 use clap_complete::{Shell, generate};
 
diff --git a/src/cmd/config.rs b/src/cmd/config.rs
@@ -9,7 +9,7 @@ use std::io::Write;
 use miette::{Context as _, IntoDiagnostic as _};
 use serde_json;
 
-use crate::error::*;
+use crate::Result;
 use crate::sess::Session;
 
 /// Execute the `config` subcommand.
diff --git a/src/cmd/fusesoc.rs b/src/cmd/fusesoc.rs
@@ -20,9 +20,9 @@ use serde::{Deserialize, Serialize};
 use tokio::runtime::Runtime;
 use walkdir::{DirEntry, WalkDir};
 
+use crate::Result;
 use crate::diagnostic::Warnings;
 use crate::err;
-use crate::error::*;
 use crate::sess::{Session, SessionIo};
 use crate::src::{SourceFile, SourceGroup};
 use crate::target::TargetSet;
diff --git a/src/cmd/init.rs b/src/cmd/init.rs
@@ -12,8 +12,8 @@ use std::process::Command as SysCommand;
 
 use miette::IntoDiagnostic as _;
 
+use crate::Result;
 use crate::bail;
-use crate::error::*;
 
 /// Execute the `init` subcommand.
 pub fn run() -> Result<()> {
diff --git a/src/cmd/packages.rs b/src/cmd/packages.rs
@@ -11,7 +11,7 @@ use miette::IntoDiagnostic as _;
 use tabwriter::TabWriter;
 use tokio::runtime::Runtime;
 
-use crate::error::*;
+use crate::Result;
 use crate::sess::{DependencySource, Session, SessionIo};
 
 /// Information about the dependency graph
diff --git a/src/cmd/parents.rs b/src/cmd/parents.rs
@@ -12,8 +12,8 @@ use miette::IntoDiagnostic as _;
 use tabwriter::TabWriter;
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::config::Dependency;
-use crate::error::*;
 use crate::sess::{DependencyConstraint, DependencySource};
 use crate::sess::{Session, SessionIo};
 use crate::{fmt_path, fmt_version};
diff --git a/src/cmd/path.rs b/src/cmd/path.rs
@@ -10,8 +10,8 @@ use futures::future::join_all;
 use miette::IntoDiagnostic as _;
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::debugln;
-use crate::error::*;
 use crate::sess::{Session, SessionIo};
 
 /// Get the path to a dependency
diff --git a/src/cmd/script.rs b/src/cmd/script.rs
@@ -13,10 +13,10 @@ use serde::Serialize;
 use tera::{Context, Tera};
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::cmd::sources::get_passed_targets;
 use crate::config::{Validate, ValidationContext};
 use crate::diagnostic::Warnings;
-use crate::error::*;
 use crate::sess::{Session, SessionIo};
 use crate::src::{SourceFile, SourceGroup, SourceType};
 use crate::target::TargetSet;
diff --git a/src/cmd/snapshot.rs b/src/cmd/snapshot.rs
@@ -11,12 +11,12 @@ use indexmap::IndexMap;
 use miette::{Context as _, IntoDiagnostic as _};
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::bail;
 use crate::cli::{remove_symlink_dir, symlink_dir};
 use crate::cmd::clone::get_path_subdeps;
 use crate::config::{Dependency, Locked, LockedSource};
 use crate::diagnostic::Warnings;
-use crate::error::*;
 use crate::infoln;
 use crate::sess::{DependencySource, Session, SessionIo};
 use crate::{debugln, fmt_path, fmt_pkg, stageln};
diff --git a/src/cmd/sources.rs b/src/cmd/sources.rs
@@ -14,8 +14,8 @@ use miette::{Context as _, IntoDiagnostic as _};
 use serde_json;
 use tokio::runtime::Runtime;
 
+use crate::Result;
 use crate::config::{Dependency, Validate, ValidationContext};
-use crate::error::*;
 use crate::sess::{Session, SessionIo};
 use crate::target::{TargetSet, TargetSpec};
 
diff --git a/src/cmd/update.rs b/src/cmd/update.rs
@@ -10,12 +10,12 @@ use clap::Args;
 use indexmap::IndexSet;
 use tabwriter::TabWriter;
 
+use crate::Result;
 use crate::cmd;
 use crate::config::{Locked, LockedPackage};
 use crate::debugln;
 use crate::diagnostic::Warnings;
 use crate::ensure;
-use crate::error::*;
 use crate::lockfile::*;
 use crate::resolver::DependencyResolver;
 use crate::sess::Session;
diff --git a/src/cmd/vendor.rs b/src/cmd/vendor.rs
@@ -19,10 +19,10 @@ use tokio::runtime::Runtime;
 use crate::config;
 use crate::config::PrefixPaths;
 use crate::diagnostic::Warnings;
-use crate::error::*;
 use crate::git::Git;
 use crate::progress::{GitProgressOps, ProgressHandler};
 use crate::sess::{DependencySource, Session, SessionErrors};
+use crate::{Error, Result};
 use crate::{bail, ensure};
 use crate::{fmt_path, fmt_pkg, stageln};
 
diff --git a/src/config.rs b/src/config.rs
@@ -27,9 +27,9 @@ use serde_yaml_ng::Value;
 use subst;
 
 use crate::diagnostic::Warnings;
-use crate::error::*;
 use crate::target::TargetSpec;
 use crate::util::*;
+use crate::{Error, Result};
 use crate::{bail, err};
 
 /// A package manifest.
diff --git a/src/diagnostic.rs b/src/diagnostic.rs
@@ -4,6 +4,7 @@
 use std::collections::HashSet;
 use std::fmt;
 use std::path::PathBuf;
+use std::sync::atomic::AtomicBool;
 use std::sync::{Mutex, OnceLock};
 
 use indicatif::MultiProgress;
@@ -14,6 +15,51 @@ use thiserror::Error;
 use crate::{fmt_dim, fmt_field, fmt_path, fmt_pkg, fmt_version, fmt_with_style};
 
 static GLOBAL_DIAGNOSTICS: OnceLock<Diagnostics> = OnceLock::new();
+pub static ENABLE_DEBUG: AtomicBool = AtomicBool::new(false);
+
+/// Emit a diagnostic message.
+#[macro_export]
+macro_rules! diagnostic {
+    ($prefix:expr; $($arg:tt)*) => {
+        $crate::diagnostic::Diagnostics::eprintln(&format!("{:>14} {}", $prefix, format!($($arg)*)))
+    }
+}
+
+/// Print an error.
+#[macro_export]
+macro_rules! errorln {
+    ($($arg:tt)*) => { $crate::diagnostic!($crate::fmt_with_style!("Error", owo_colors::Style::new().red().bold()); $($arg)*); }
+}
+
+/// Print an informational note.
+#[macro_export]
+macro_rules! infoln {
+    ($($arg:tt)*) => { $crate::diagnostic!($crate::fmt_with_style!("Info", owo_colors::Style::new().white().bold()); $($arg)*); }
+}
+
+/// Print debug information. Omitted in release builds.
+#[macro_export]
+#[cfg(debug_assertions)]
+macro_rules! debugln {
+    ($($arg:tt)*) => {
+        if $crate::diagnostic::ENABLE_DEBUG.load(std::sync::atomic::Ordering::Relaxed) {
+            $crate::diagnostic!($crate::fmt_with_style!("Debug", owo_colors::Style::new().blue().bold()); $($arg)*);
+        }
+    }
+}
+
+/// Print debug information. Omitted in release builds.
+#[macro_export]
+#[cfg(not(debug_assertions))]
+macro_rules! debugln {
+    ($($arg:tt)*) => {};
+}
+
+/// Format and print stage progress.
+#[macro_export]
+macro_rules! stageln {
+    ($stage_name:expr, $($arg:tt)*) => { $crate::diagnostic!($crate::fmt_with_style!($stage_name, owo_colors::Style::new().green().bold()); $($arg)*); }
+}
 
 /// A diagnostics manager that handles warnings (and errors).
 #[derive(Debug)]
diff --git a/src/error.rs b/src/error.rs
diff --git a/src/git.rs b/src/git.rs
@@ -22,7 +22,7 @@ use crate::progress::{ProgressHandler, monitor_stderr};
 
 use crate::debugln;
 use crate::err;
-use crate::error::*;
+use crate::{Error, Result};
 
 #[derive(Debug, Error, Diagnostic)]
 enum GitSpawnError {
diff --git a/src/lib.rs b/src/lib.rs
@@ -4,7 +4,6 @@ pub mod cli;
 pub mod cmd;
 pub mod config;
 pub mod diagnostic;
-pub mod error;
 pub mod git;
 pub mod lockfile;
 pub mod progress;
@@ -15,3 +14,6 @@ pub mod target;
 pub mod util;
 
 pub use miette::{bail, ensure, miette as err};
+
+pub type Error = miette::Report;
+pub type Result<T> = miette::Result<T>;
diff --git a/src/lockfile.rs b/src/lockfile.rs
@@ -6,9 +6,9 @@ use std::path::Path;
 
 use miette::{Context as _, IntoDiagnostic as _};
 
+use crate::Result;
 use crate::config::{Locked, LockedPackage, LockedSource, PrefixPaths};
 use crate::debugln;
-use crate::error::*;
 
 /// Read a lock file.
 pub fn read_lockfile(path: &Path, root_dir: &Path) -> Result<Locked> {
diff --git a/src/progress.rs b/src/progress.rs
diff --git a/src/resolver.rs b/src/resolver.rs
diff --git a/src/sess.rs b/src/sess.rs
diff --git a/src/src.rs b/src/src.rs
diff --git a/src/target.rs b/src/target.rs
diff --git a/src/util.rs b/src/util.rs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`fn main() {`
`5`	`5`	`if let Err(e) = bender::cli::main() {`
`6`		`- bender::diagnostic::Diagnostics::eprintln(&format!("{e:?}"));`
	`6`	`+ eprintln!("{e:?}");`
`7`	`7`	`std::process::exit(1);`
`8`	`8`	`}`
`9`	`9`	`}`