Replace qualified miette with use

diff --git a/src/bin/quire/commands/exec.rs b/src/bin/quire/commands/exec.rs
index 59f8f9e186a464ee48d2cb6a640733e0836876bf..39bf311a1a50a3e72d8e65fdae889006532eaa5c 100644 (file)
--- a/src/bin/quire/commands/exec.rs
+++ b/src/bin/quire/commands/exec.rs
@@ -1,7 +1,7 @@
 use std::os::unix::process::CommandExt;
 use std::process::Command;
 
-use miette::{Context, IntoDiagnostic, Result, bail, ensure};
+use miette::{Context, IntoDiagnostic, Result, bail, ensure, miette};
 
 use quire::Quire;
 
@@ -52,7 +52,7 @@ fn dispatch_git(quire: &Quire, git_cmd: &str, args: &[String]) -> Result<()> {
     // binary handles dispatch to libexec/git-core/ internally.
     let subcommand = git_cmd
         .strip_prefix("git-")
-        .ok_or_else(|| miette::miette!("unexpected git command: {git_cmd}"))?;
+        .ok_or_else(|| miette!("unexpected git command: {git_cmd}"))?;
     let err = Command::new("git")
         .arg(subcommand)
         .arg(".")

diff --git a/src/error.rs b/src/error.rs
index c930e2f8d8ae71a8ccb59ac6fe96c561896e7431..cc06d7ca743ae5656e9d4e9fd9b1f9015e657b1e 100644 (file)
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,4 +1,6 @@
-#[derive(Debug, thiserror::Error, miette::Diagnostic)]
+use miette::Diagnostic;
+
+#[derive(Debug, thiserror::Error, Diagnostic)]
 pub enum Error {
     #[error("not found: {0}")]
     NotFound(String),

diff --git a/src/fennel.rs b/src/fennel.rs
index a14d346d9a91b6855401469b14151ea880a223cf..ecc61530f55b04287f5095fd431604d9ee779bb6 100644 (file)
--- a/src/fennel.rs
+++ b/src/fennel.rs
@@ -1,12 +1,12 @@
 use std::path::Path;
 
-use miette::{Result, SourceOffset};
+use miette::{Diagnostic, Result, SourceOffset};
 use mlua::{Lua, LuaSerdeExt};
 
 const FENNEL_LUA: &str = include_str!("../vendor/fennel.lua");
 
 /// Error kinds from the Fennel loader.
-#[derive(Debug, thiserror::Error, miette::Diagnostic)]
+#[derive(Debug, thiserror::Error, Diagnostic)]
 pub enum FennelError {
     #[error("file not found: {0}")]
     FileNotFound(String),

diff --git a/src/quire.rs b/src/quire.rs
index 78a589e97e31becbb8a747a7831175cf3c1c2ffd..43485851259f6787a11e71e331a7e0ab1dd772c4 100644 (file)
--- a/src/quire.rs
+++ b/src/quire.rs
@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use miette::{IntoDiagnostic, Result, ensure};
+use miette::{IntoDiagnostic, Result, ensure, miette};
 
 use crate::fennel::Fennel;
 use crate::secret::SecretString;
@@ -219,9 +219,9 @@ impl Quire {
     /// `.git` suffix. Used by hooks that receive `GIT_DIR` from git.
     pub fn repo_from_path(&self, path: &Path) -> Result<Repo> {
         let resolved = self.repos_dir();
-        let relative = path.strip_prefix(&resolved).map_err(|_| {
-            miette::miette!("path is not under repos directory: {}", path.display())
-        })?;
+        let relative = path
+            .strip_prefix(&resolved)
+            .map_err(|_| miette!("path is not under repos directory: {}", path.display()))?;
         let name = relative.to_string_lossy();
         validate_repo_name(&name)?;
         Ok(Repo {