Skip to content

Added no-mut-static feature #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Buzzec wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added no-mut-static feature #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eyre/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ default = ["anyhow", "auto-install", "track-caller"]
anyhow = []
auto-install = []
track-caller = []
no-mut-static = []

[dependencies]
indenter = { workspace = true }
Expand Down
20 changes: 17 additions & 3 deletions eyre/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ pub use eyre as format_err;
/// Compatibility re-export of `eyre` for interop with `anyhow`
#[cfg(feature = "anyhow")]
pub use eyre as anyhow;
#[cfg(not(feature = "no-mut-static"))]
use once_cell::sync::OnceCell;
use ptr::OwnedPtr;
#[cfg(feature = "anyhow")]
Expand Down Expand Up @@ -485,6 +486,7 @@ pub struct Report {
type ErrorHook =
Box<dyn Fn(&(dyn StdError + 'static)) -> Box<dyn EyreHandler> + Sync + Send + 'static>;

#[cfg(not(feature = "no-mut-static"))]
static HOOK: OnceCell<ErrorHook> = OnceCell::new();

/// Error indicating that `set_hook` was unable to install the provided ErrorHook
Expand Down Expand Up @@ -595,24 +597,36 @@ impl StdError for InstallError {}
/// }
/// }
/// ```
#[cfg_attr(feature = "no-mut-static", allow(unused_variables))]
pub fn set_hook(hook: ErrorHook) -> Result<(), InstallError> {
HOOK.set(hook).map_err(|_| InstallError)
#[cfg(not(feature = "no-mut-static"))]
{
HOOK.set(hook).map_err(|_| InstallError)
}

#[cfg(feature = "no-mut-static")]
{
Err(InstallError)
}
}

#[cfg_attr(track_caller, track_caller)]
#[cfg_attr(not(track_caller), allow(unused_mut))]
fn capture_handler(error: &(dyn StdError + 'static)) -> Box<dyn EyreHandler> {
#[cfg(not(feature = "auto-install"))]
#[cfg(not(any(feature = "no-mut-static", feature = "auto-install")))]
let hook = HOOK
.get()
.expect("a handler must always be installed if the `auto-install` feature is disabled")
.as_ref();

#[cfg(feature = "auto-install")]
#[cfg(all(not(feature = "no-mut-static"), feature = "auto-install"))]
let hook = HOOK
.get_or_init(|| Box::new(DefaultHandler::default_with))
.as_ref();

#[cfg(feature = "no-mut-static")]
let hook = &DefaultHandler::default_with;

let mut handler = hook(error);

#[cfg(track_caller)]
Expand Down