Skip to content

Commit

Permalink
Merge pull request #2344 from dtolnay/coreerror
Browse files Browse the repository at this point in the history
Make StdError identical to core::error::Error on feature="unstable"
  • Loading branch information
dtolnay authored Dec 16, 2022
2 parents e7060ba + df40f80 commit f261184
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions serde/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
// discussion of these features please refer to this issue:
//
// https://github.com/serde-rs/serde/issues/812
#![cfg_attr(feature = "unstable", feature(never_type))]
#![cfg_attr(feature = "unstable", feature(error_in_core, never_type))]
#![allow(unknown_lints, bare_trait_objects, deprecated)]
#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
// Ignored clippy and clippy_pedantic lints
Expand Down Expand Up @@ -303,7 +303,7 @@ use self::__private as private;
#[path = "de/seed.rs"]
mod seed;

#[cfg(not(feature = "std"))]
#[cfg(not(any(feature = "std", feature = "unstable")))]
mod std_error;

// Re-export #[derive(Serialize, Deserialize)].
Expand Down
5 changes: 4 additions & 1 deletion serde/src/ser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,13 @@ mod impossible;

pub use self::impossible::Impossible;

#[cfg(all(feature = "unstable", not(feature = "std")))]
#[doc(inline)]
pub use core::error::Error as StdError;
#[cfg(feature = "std")]
#[doc(no_inline)]
pub use std::error::Error as StdError;
#[cfg(not(feature = "std"))]
#[cfg(not(any(feature = "std", feature = "unstable")))]
#[doc(no_inline)]
pub use std_error::Error as StdError;

Expand Down

0 comments on commit f261184

Please sign in to comment.