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

Merge pull request #2970 from dtolnay/coredoctest

Browse Source 
Fix serde_core doc tests
This commit is contained in:
David Tolnay
2025-09-13 14:36:00 -07:00
committed by GitHub
parent 0990d97a77 6bea2e04e4
commit 69aa109fd3
8 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/Cargo.toml
-3
View File
@@ -18,9 +18,6 @@ rust-version = "1.56"
serde_core = { version = "=1.0.219", path = "../serde_core", default-features = false, features = ["result"] } serde_core = { version = "=1.0.219", path = "../serde_core", default-features = false, features = ["result"] }
serde_derive = { version = "1", optional = true, path = "../serde_derive" } serde_derive = { version = "1", optional = true, path = "../serde_derive" }
[dev-dependencies]
serde_derive = { version = "1", path = "../serde_derive" }
[package.metadata.playground] [package.metadata.playground]
features = ["derive", "rc"] features = ["derive", "rc"]
serde/src/lib.rs
+4 -8
View File
@@ -212,9 +212,6 @@ mod lib {
pub use alloc::boxed::Box; pub use alloc::boxed::Box;
#[cfg(feature = "std")] #[cfg(feature = "std")]
pub use std::boxed::Box; pub use std::boxed::Box;
#[cfg(feature = "std")]
pub use std::error;
} }
// None of this crate's error handling needs the `From::from` error conversion // None of this crate's error handling needs the `From::from` error conversion
@@ -233,11 +230,10 @@ macro_rules! tri {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#[doc(inline)] pub use serde_core::{
pub use crate::de::{Deserialize, Deserializer}; de, forward_to_deserialize_any, ser, serde_if_integer128, Deserialize, Deserializer, Serialize,
#[doc(inline)] Serializer,
pub use crate::ser::{Serialize, Serializer}; };
pub use serde_core::*;
// Used by generated code and doc tests. Not public API. // Used by generated code and doc tests. Not public API.
#[doc(hidden)] #[doc(hidden)]
serde/src/private/mod.rs
-3
View File
@@ -3,9 +3,6 @@ pub mod de;
#[cfg(not(no_serde_derive))] #[cfg(not(no_serde_derive))]
pub mod ser; pub mod ser;
// FIXME: #[cfg(doctest)] once https://github.com/rust-lang/rust/issues/67295 is fixed.
pub mod doc;
pub use crate::lib::clone::Clone; pub use crate::lib::clone::Clone;
pub use crate::lib::convert::{From, Into, TryFrom}; pub use crate::lib::convert::{From, Into, TryFrom};
pub use crate::lib::default::Default; pub use crate::lib::default::Default;
serde_core/Cargo.toml
+1
View File
@@ -15,6 +15,7 @@ rust-version = "1.56"
[dev-dependencies] [dev-dependencies]
serde = { version = "1", path = "../serde" } serde = { version = "1", path = "../serde" }
serde_derive = { version = "1", path = "../serde_derive" }
[package.metadata.playground] [package.metadata.playground]
features = ["rc", "result"] features = ["rc", "result"]
serde/src/private/doc.rs → serde_core/src/private/doc.rs
View File
serde_core/src/private/mod.rs
+4
View File
@@ -2,6 +2,10 @@
mod content; mod content;
mod seed; mod seed;
// FIXME: #[cfg(doctest)] once https://github.com/rust-lang/rust/issues/67295 is fixed.
#[doc(hidden)]
pub mod doc;
#[doc(hidden)] #[doc(hidden)]
pub mod size_hint; pub mod size_hint;
serde_core/src/ser/impossible.rs
+2 -2
View File
@@ -17,7 +17,7 @@ use crate::ser::{
/// ///
/// ```edition2021 /// ```edition2021
/// # use serde::ser::{Serializer, Impossible}; /// # use serde::ser::{Serializer, Impossible};
/// # use serde::__private::doc::Error; /// # use serde_core::__private::doc::Error;
/// # /// #
/// # struct MySerializer; /// # struct MySerializer;
/// # /// #
@@ -41,7 +41,7 @@ use crate::ser::{
/// } /// }
/// ///
/// /* other Serializer methods */ /// /* other Serializer methods */
/// # serde::__serialize_unimplemented! { /// # serde_core::__serialize_unimplemented! {
/// # bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str bytes none some /// # bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str bytes none some
/// # unit unit_struct unit_variant newtype_struct newtype_variant /// # unit unit_struct unit_variant newtype_struct newtype_variant
/// # tuple tuple_struct tuple_variant map struct struct_variant /// # tuple tuple_struct tuple_variant map struct struct_variant
serde_core/src/ser/mod.rs
+18 -18
View File
@@ -413,7 +413,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for bool { /// impl Serialize for bool {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -435,7 +435,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for i8 { /// impl Serialize for i8 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -457,7 +457,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for i16 { /// impl Serialize for i16 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -479,7 +479,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for i32 { /// impl Serialize for i32 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -497,7 +497,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for i64 { /// impl Serialize for i64 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -515,7 +515,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for i128 { /// impl Serialize for i128 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -542,7 +542,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for u8 { /// impl Serialize for u8 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -564,7 +564,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for u16 { /// impl Serialize for u16 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -586,7 +586,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for u32 { /// impl Serialize for u32 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -604,7 +604,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for u64 { /// impl Serialize for u64 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -622,7 +622,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for u128 { /// impl Serialize for u128 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -649,7 +649,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for f32 { /// impl Serialize for f32 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -667,7 +667,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for f64 { /// impl Serialize for f64 {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -688,7 +688,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for char { /// impl Serialize for char {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -706,7 +706,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for str { /// impl Serialize for str {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -729,7 +729,7 @@ pub trait Serializer: Sized {
/// ///
/// ```edition2021 /// ```edition2021
/// # use serde::ser::{Serializer, SerializeSeq}; /// # use serde::ser::{Serializer, SerializeSeq};
/// # use serde::__private::doc::Error; /// # use serde_core::__private::doc::Error;
/// # /// #
/// # struct MySerializer; /// # struct MySerializer;
/// # /// #
@@ -745,7 +745,7 @@ pub trait Serializer: Sized {
/// seq.end() /// seq.end()
/// } /// }
/// # /// #
/// # serde::__serialize_unimplemented! { /// # serde_core::__serialize_unimplemented! {
/// # bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str none some /// # bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str none some
/// # unit unit_struct unit_variant newtype_struct newtype_variant /// # unit unit_struct unit_variant newtype_struct newtype_variant
/// # seq tuple tuple_struct tuple_variant map struct struct_variant /// # seq tuple tuple_struct tuple_variant map struct struct_variant
@@ -827,7 +827,7 @@ pub trait Serializer: Sized {
/// ```edition2021 /// ```edition2021
/// # use serde::Serializer; /// # use serde::Serializer;
/// # /// #
/// # serde::__private_serialize!(); /// # serde_core::__private_serialize!();
/// # /// #
/// impl Serialize for () { /// impl Serialize for () {
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> /// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>