Skip to content

Commit

Permalink
Merge branch 'master' into feature/error-ref-macro
Browse files Browse the repository at this point in the history
  • Loading branch information
Techcable authored Jan 3, 2024
2 parents e2a25e9 + a50e813 commit 4d0aefc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//!
//! `slog-rs` is an ecosystem of reusable components for structured, extensible,
//! composable logging for Rust.
//!
//!e
//! `slog` is `slog-rs`'s main crate providing core components shared between
//! all other parts of `slog-rs` ecosystem.
//!
Expand Down Expand Up @@ -3500,6 +3500,7 @@ where
#[cfg(feature = "std")]
pub struct ErrorRef<'a, E: ?Sized + std::error::Error>(pub &'a E);


#[cfg(feature = "std")]
impl<'a, E> Value for ErrorRef<'a, E>
where
Expand Down
2 changes: 2 additions & 0 deletions src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ mod std_only {
let logger = Logger::root(CheckError, o!());
info!(logger, "foonot-error: not-error; "; "not-error" => "not-error", "error" => #error);
slog_info!(logger, "foonot-error: not-error; "; "not-error" => "not-error", "error" => #error);

}

#[test]
Expand Down Expand Up @@ -260,6 +261,7 @@ mod std_only {
info!(logger, "not found"; "error" => #std::io::Error::from(std::io::ErrorKind::NotFound));
let error = std::io::Error::from(std::io::ErrorKind::NotFound);
info!(logger, "not found"; "error" => #&error);

}
}

Expand Down

0 comments on commit 4d0aefc

Please sign in to comment.