Skip to content

Commit 7669a73

Browse files
dtolnaydtolnay
committed
Move doc helper macros to serde_core
1 parent d048633 commit 7669a73

6 files changed

Lines changed: 24 additions & 26 deletions

File tree

‎serde/src/lib.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ mod lib {
212212
pub use alloc::boxed::Box;
213213
#[cfg(feature = "std")]
214214
pub use std::boxed::Box;
215-
216-
#[cfg(feature = "std")]
217-
pub use std::error;
218215
}
219216

220217
// None of this crate's error handling needs the `From::from` error conversion

‎serde/src/private/mod.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ pub mod de;
33
#[cfg(not(no_serde_derive))]
44
pub mod ser;
55

6-
// FIXME: #[cfg(doctest)] once https://github.com/rust-lang/rust/issues/67295 is fixed.
7-
pub mod doc;
8-
96
pub use crate::lib::clone::Clone;
107
pub use crate::lib::convert::{From, Into, TryFrom};
118
pub use crate::lib::default::Default;

serde/src/private/doc.rs renamed to serde_core/src/private/doc.rs

File renamed without changes.

‎serde_core/src/private/mod.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
mod content;
33
mod seed;
44

5+
// FIXME: #[cfg(doctest)] once https://github.com/rust-lang/rust/issues/67295 is fixed.
6+
#[doc(hidden)]
7+
pub mod doc;
8+
59
#[doc(hidden)]
610
pub mod size_hint;
711

‎serde_core/src/ser/impossible.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use crate::ser::{
1717
///
1818
/// ```edition2021
1919
/// # use serde::ser::{Serializer, Impossible};
20-
/// # use serde::__private::doc::Error;
20+
/// # use serde_core::__private::doc::Error;
2121
/// #
2222
/// # struct MySerializer;
2323
/// #
@@ -41,7 +41,7 @@ use crate::ser::{
4141
/// }
4242
///
4343
/// /* other Serializer methods */
44-
/// # serde::__serialize_unimplemented! {
44+
/// # serde_core::__serialize_unimplemented! {
4545
/// # bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str bytes none some
4646
/// # unit unit_struct unit_variant newtype_struct newtype_variant
4747
/// # tuple tuple_struct tuple_variant map struct struct_variant

‎serde_core/src/ser/mod.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ pub trait Serializer: Sized {
413413
/// ```edition2021
414414
/// # use serde::Serializer;
415415
/// #
416-
/// # serde::__private_serialize!();
416+
/// # serde_core::__private_serialize!();
417417
/// #
418418
/// impl Serialize for bool {
419419
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -435,7 +435,7 @@ pub trait Serializer: Sized {
435435
/// ```edition2021
436436
/// # use serde::Serializer;
437437
/// #
438-
/// # serde::__private_serialize!();
438+
/// # serde_core::__private_serialize!();
439439
/// #
440440
/// impl Serialize for i8 {
441441
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -457,7 +457,7 @@ pub trait Serializer: Sized {
457457
/// ```edition2021
458458
/// # use serde::Serializer;
459459
/// #
460-
/// # serde::__private_serialize!();
460+
/// # serde_core::__private_serialize!();
461461
/// #
462462
/// impl Serialize for i16 {
463463
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -479,7 +479,7 @@ pub trait Serializer: Sized {
479479
/// ```edition2021
480480
/// # use serde::Serializer;
481481
/// #
482-
/// # serde::__private_serialize!();
482+
/// # serde_core::__private_serialize!();
483483
/// #
484484
/// impl Serialize for i32 {
485485
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -497,7 +497,7 @@ pub trait Serializer: Sized {
497497
/// ```edition2021
498498
/// # use serde::Serializer;
499499
/// #
500-
/// # serde::__private_serialize!();
500+
/// # serde_core::__private_serialize!();
501501
/// #
502502
/// impl Serialize for i64 {
503503
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -515,7 +515,7 @@ pub trait Serializer: Sized {
515515
/// ```edition2021
516516
/// # use serde::Serializer;
517517
/// #
518-
/// # serde::__private_serialize!();
518+
/// # serde_core::__private_serialize!();
519519
/// #
520520
/// impl Serialize for i128 {
521521
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -542,7 +542,7 @@ pub trait Serializer: Sized {
542542
/// ```edition2021
543543
/// # use serde::Serializer;
544544
/// #
545-
/// # serde::__private_serialize!();
545+
/// # serde_core::__private_serialize!();
546546
/// #
547547
/// impl Serialize for u8 {
548548
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -564,7 +564,7 @@ pub trait Serializer: Sized {
564564
/// ```edition2021
565565
/// # use serde::Serializer;
566566
/// #
567-
/// # serde::__private_serialize!();
567+
/// # serde_core::__private_serialize!();
568568
/// #
569569
/// impl Serialize for u16 {
570570
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -586,7 +586,7 @@ pub trait Serializer: Sized {
586586
/// ```edition2021
587587
/// # use serde::Serializer;
588588
/// #
589-
/// # serde::__private_serialize!();
589+
/// # serde_core::__private_serialize!();
590590
/// #
591591
/// impl Serialize for u32 {
592592
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -604,7 +604,7 @@ pub trait Serializer: Sized {
604604
/// ```edition2021
605605
/// # use serde::Serializer;
606606
/// #
607-
/// # serde::__private_serialize!();
607+
/// # serde_core::__private_serialize!();
608608
/// #
609609
/// impl Serialize for u64 {
610610
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -622,7 +622,7 @@ pub trait Serializer: Sized {
622622
/// ```edition2021
623623
/// # use serde::Serializer;
624624
/// #
625-
/// # serde::__private_serialize!();
625+
/// # serde_core::__private_serialize!();
626626
/// #
627627
/// impl Serialize for u128 {
628628
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -649,7 +649,7 @@ pub trait Serializer: Sized {
649649
/// ```edition2021
650650
/// # use serde::Serializer;
651651
/// #
652-
/// # serde::__private_serialize!();
652+
/// # serde_core::__private_serialize!();
653653
/// #
654654
/// impl Serialize for f32 {
655655
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -667,7 +667,7 @@ pub trait Serializer: Sized {
667667
/// ```edition2021
668668
/// # use serde::Serializer;
669669
/// #
670-
/// # serde::__private_serialize!();
670+
/// # serde_core::__private_serialize!();
671671
/// #
672672
/// impl Serialize for f64 {
673673
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -688,7 +688,7 @@ pub trait Serializer: Sized {
688688
/// ```edition2021
689689
/// # use serde::Serializer;
690690
/// #
691-
/// # serde::__private_serialize!();
691+
/// # serde_core::__private_serialize!();
692692
/// #
693693
/// impl Serialize for char {
694694
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -706,7 +706,7 @@ pub trait Serializer: Sized {
706706
/// ```edition2021
707707
/// # use serde::Serializer;
708708
/// #
709-
/// # serde::__private_serialize!();
709+
/// # serde_core::__private_serialize!();
710710
/// #
711711
/// impl Serialize for str {
712712
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -729,7 +729,7 @@ pub trait Serializer: Sized {
729729
///
730730
/// ```edition2021
731731
/// # use serde::ser::{Serializer, SerializeSeq};
732-
/// # use serde::__private::doc::Error;
732+
/// # use serde_core::__private::doc::Error;
733733
/// #
734734
/// # struct MySerializer;
735735
/// #
@@ -745,7 +745,7 @@ pub trait Serializer: Sized {
745745
/// seq.end()
746746
/// }
747747
/// #
748-
/// # serde::__serialize_unimplemented! {
748+
/// # serde_core::__serialize_unimplemented! {
749749
/// # bool i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str none some
750750
/// # unit unit_struct unit_variant newtype_struct newtype_variant
751751
/// # seq tuple tuple_struct tuple_variant map struct struct_variant
@@ -827,7 +827,7 @@ pub trait Serializer: Sized {
827827
/// ```edition2021
828828
/// # use serde::Serializer;
829829
/// #
830-
/// # serde::__private_serialize!();
830+
/// # serde_core::__private_serialize!();
831831
/// #
832832
/// impl Serialize for () {
833833
/// fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>

0 commit comments

Comments
 (0)