berkus
/
miette
mirror of https://github.com/zkat/miette.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: make `fancy-no-syscall` the base feature

This commit is contained in:
Boshen 2024-02-22 14:21:02 +08:00
parent 8f2db83fb2
commit 08bb4affca
No known key found for this signature in database
GPG Key ID: 234DA6A7079C6801
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -53,8 +53,7 @@ fancy-no-syscall = [
"textwrap", "textwrap",
] ]
fancy-no-backtrace = [ fancy-no-backtrace = [
"owo-colors", "fancy-no-syscall",
"textwrap",
"terminal_size", "terminal_size",
"supports-hyperlinks", "supports-hyperlinks",
"supports-color", "supports-color",

8
src/eyreish/mod.rs
View File

@ -24,10 +24,10 @@ pub use ReportHandler as EyreContext;
#[allow(unreachable_pub)] #[allow(unreachable_pub)]
pub use WrapErr as Context; pub use WrapErr as Context;
#[cfg(not(feature = "fancy-no-backtrace"))] #[cfg(not(feature = "fancy-no-syscall"))]
use crate::DebugReportHandler; use crate::DebugReportHandler;
use crate::Diagnostic; use crate::Diagnostic;
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
use crate::MietteHandler; use crate::MietteHandler;
use error::ErrorImpl; use error::ErrorImpl;
@ -102,9 +102,9 @@ fn capture_handler(error: &(dyn Diagnostic + 'static)) -> Box<dyn ReportHandler>
} }
fn get_default_printer(_err: &(dyn Diagnostic + 'static)) -> Box<dyn ReportHandler + 'static> { fn get_default_printer(_err: &(dyn Diagnostic + 'static)) -> Box<dyn ReportHandler + 'static> {
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
return Box::new(MietteHandler::new()); return Box::new(MietteHandler::new());
#[cfg(not(feature = "fancy-no-backtrace"))] #[cfg(not(feature = "fancy-no-syscall"))]
return Box::new(DebugReportHandler::new()); return Box::new(DebugReportHandler::new());
} }

8
src/handlers/mod.rs
View File

@ -5,20 +5,20 @@ Reporters included with `miette`.
#[allow(unreachable_pub)] #[allow(unreachable_pub)]
pub use debug::*; pub use debug::*;
#[allow(unreachable_pub)] #[allow(unreachable_pub)]
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
pub use graphical::*; pub use graphical::*;
#[allow(unreachable_pub)] #[allow(unreachable_pub)]
pub use json::*; pub use json::*;
#[allow(unreachable_pub)] #[allow(unreachable_pub)]
pub use narratable::*; pub use narratable::*;
#[allow(unreachable_pub)] #[allow(unreachable_pub)]
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
pub use theme::*; pub use theme::*;
mod debug; mod debug;
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
mod graphical; mod graphical;
mod json; mod json;
mod narratable; mod narratable;
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
mod theme; mod theme;

6
src/lib.rs
View File

@ -760,7 +760,7 @@ pub use miette_derive::*;
pub use error::*; pub use error::*;
pub use eyreish::*; pub use eyreish::*;
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
pub use handler::*; pub use handler::*;
pub use handlers::*; pub use handlers::*;
pub use miette_diagnostic::*; pub use miette_diagnostic::*;
@ -773,10 +773,10 @@ mod chain;
mod diagnostic_chain; mod diagnostic_chain;
mod error; mod error;
mod eyreish; mod eyreish;
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
mod handler; mod handler;
mod handlers; mod handlers;
#[cfg(feature = "fancy-no-backtrace")] #[cfg(feature = "fancy-no-syscall")]
pub mod highlighters; pub mod highlighters;
#[doc(hidden)] #[doc(hidden)]
pub mod macro_helpers; pub mod macro_helpers;