From 20aefb99edf46a087c7e81b5fc7414e9c8721a74 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Thu, 2 Apr 2026 10:16:01 +1000 Subject: [PATCH] replace nixide::NixVerbosity with an export of nixide-sys::NixVerbosity --- nixide/src/verbosity.rs | 45 ++++------------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/nixide/src/verbosity.rs b/nixide/src/verbosity.rs index a95f55c..8e1b2c0 100644 --- a/nixide/src/verbosity.rs +++ b/nixide/src/verbosity.rs @@ -1,46 +1,9 @@ use crate::errors::ErrorContext; use crate::sys; +use crate::util::wrap; use crate::util::wrappers::AsInnerPtr as _; -use crate::util::{panic_issue_call_failed, wrap}; -/// Verbosity level -/// -/// # NOTE -/// -/// This should be kept in sync with the C++ implementation (nix::Verbosity) -/// -#[derive(Debug, Clone, Copy)] -pub enum NixVerbosity { - Error, - Warn, - Notice, - Info, - Talkative, - Chatty, - Debug, - Vomit, -} - -impl From for NixVerbosity { - fn from(level: sys::NixVerbosity) -> NixVerbosity { - match level { - sys::NixVerbosity::Error => NixVerbosity::Error, - sys::NixVerbosity::Warn => NixVerbosity::Warn, - sys::NixVerbosity::Notice => NixVerbosity::Notice, - sys::NixVerbosity::Info => NixVerbosity::Info, - sys::NixVerbosity::Talkative => NixVerbosity::Talkative, - sys::NixVerbosity::Chatty => NixVerbosity::Chatty, - sys::NixVerbosity::Debug => NixVerbosity::Debug, - sys::NixVerbosity::Vomit => NixVerbosity::Vomit, - } - } -} - -impl Into for NixVerbosity { - fn into(self) -> sys::NixVerbosity { - self as sys::NixVerbosity - } -} +pub use sys::NixVerbosity; /// Sets the verbosity level. /// @@ -67,7 +30,7 @@ impl Into for NixVerbosity { /// pub fn set_verbosity(level: NixVerbosity) { wrap::nix_fn!(|ctx: &ErrorContext| unsafe { - sys::nix_set_verbosity(ctx.as_ptr(), level.into()); + sys::nix_set_verbosity(ctx.as_ptr(), level); }) - .unwrap_or_else(|err| panic_issue_call_failed!("{}", err)) + .unwrap() }