mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2818 from dtolnay/coreerror

Browse Source 
Stabilize no-std Error trait
This commit is contained in:
David Tolnay 2024-09-06 11:16:43 -07:00 committed by GitHub
commit eeb8e44cda
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
serde/build.rs
View File

@ -15,6 +15,7 @@ fn main() {
if minor >= 77 { if minor >= 77 {
println!("cargo:rustc-check-cfg=cfg(no_core_cstr)"); println!("cargo:rustc-check-cfg=cfg(no_core_cstr)");
println!("cargo:rustc-check-cfg=cfg(no_core_error)");
println!("cargo:rustc-check-cfg=cfg(no_core_net)"); println!("cargo:rustc-check-cfg=cfg(no_core_net)");
println!("cargo:rustc-check-cfg=cfg(no_core_num_saturating)"); println!("cargo:rustc-check-cfg=cfg(no_core_num_saturating)");
println!("cargo:rustc-check-cfg=cfg(no_core_try_from)"); println!("cargo:rustc-check-cfg=cfg(no_core_try_from)");
@ -98,6 +99,12 @@ fn main() {
if minor < 78 { if minor < 78 {
println!("cargo:rustc-cfg=no_diagnostic_namespace"); println!("cargo:rustc-cfg=no_diagnostic_namespace");
} }
// The Error trait became available in core in 1.81.
// https://blog.rust-lang.org/2024/09/05/Rust-1.81.0.html#coreerrorerror
if minor < 81 {
println!("cargo:rustc-cfg=no_core_error");
}
} }
fn rustc_minor_version() -> Option<u32> { fn rustc_minor_version() -> Option<u32> {

4
serde/src/de/mod.rs
View File

@ -124,10 +124,10 @@ pub(crate) mod size_hint;
pub use self::ignored_any::IgnoredAny; pub use self::ignored_any::IgnoredAny;
#[cfg(not(any(feature = "std", feature = "unstable")))] #[cfg(all(not(feature = "std"), no_core_error))]
#[doc(no_inline)] #[doc(no_inline)]
pub use crate::std_error::Error as StdError; pub use crate::std_error::Error as StdError;
#[cfg(all(feature = "unstable", not(feature = "std")))] #[cfg(not(any(feature = "std", no_core_error)))]
#[doc(no_inline)] #[doc(no_inline)]
pub use core::error::Error as StdError; pub use core::error::Error as StdError;
#[cfg(feature = "std")] #[cfg(feature = "std")]

2
serde/src/lib.rs
View File

@ -325,7 +325,7 @@ pub mod __private;
#[path = "de/seed.rs"] #[path = "de/seed.rs"]
mod seed; mod seed;
#[cfg(not(any(feature = "std", feature = "unstable")))] #[cfg(all(not(feature = "std"), no_core_error))]
mod std_error; mod std_error;
// Re-export #[derive(Serialize, Deserialize)]. // Re-export #[derive(Serialize, Deserialize)].

4
serde/src/ser/mod.rs
View File

@ -115,10 +115,10 @@ mod impossible;
pub use self::impossible::Impossible; pub use self::impossible::Impossible;
#[cfg(not(any(feature = "std", feature = "unstable")))] #[cfg(all(not(feature = "std"), no_core_error))]
#[doc(no_inline)] #[doc(no_inline)]
pub use crate::std_error::Error as StdError; pub use crate::std_error::Error as StdError;
#[cfg(all(feature = "unstable", not(feature = "std")))] #[cfg(not(any(feature = "std", no_core_error)))]
#[doc(no_inline)] #[doc(no_inline)]
pub use core::error::Error as StdError; pub use core::error::Error as StdError;
#[cfg(feature = "std")] #[cfg(feature = "std")]