pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-14 04:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make StdError identical to core::error::Error on feature="unstable"

Browse Source
This commit is contained in:
David Tolnay
2022-12-16 10:11:37 -08:00
parent e7060ba83d
commit df40f80fcf
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/src/lib.rs
+2 -2
View File
@@ -88,7 +88,7 @@
// discussion of these features please refer to this issue: // discussion of these features please refer to this issue:
// //
// https://github.com/serde-rs/serde/issues/812 // 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)] #![allow(unknown_lints, bare_trait_objects, deprecated)]
#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))] #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
// Ignored clippy and clippy_pedantic lints // Ignored clippy and clippy_pedantic lints
@@ -303,7 +303,7 @@ use self::__private as private;
#[path = "de/seed.rs"] #[path = "de/seed.rs"]
mod seed; mod seed;
#[cfg(not(feature = "std"))] #[cfg(not(any(feature = "std", feature = "unstable")))]
mod std_error; mod std_error;
// Re-export #[derive(Serialize, Deserialize)]. // Re-export #[derive(Serialize, Deserialize)].
serde/src/ser/mod.rs
+4 -1
View File
@@ -115,10 +115,13 @@ mod impossible;
pub use self::impossible::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")] #[cfg(feature = "std")]
#[doc(no_inline)] #[doc(no_inline)]
pub use std::error::Error as StdError; pub use std::error::Error as StdError;
#[cfg(not(feature = "std"))] #[cfg(not(any(feature = "std", feature = "unstable")))]
#[doc(no_inline)] #[doc(no_inline)]
pub use std_error::Error as StdError; pub use std_error::Error as StdError;