Skip to content

Commit 5e102c4

Browse files
committed
Relocate private size_hint module
Let's keep crate::__private for only things that *need* to be accessible to the macro-generated code. Size_hint can be pub(crate).
1 parent 4aa5422 commit 5e102c4

File tree

6 files changed

+5
-8
lines changed

6 files changed

+5
-8
lines changed

serde/src/de/impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::de::{
88
use crate::seed::InPlaceSeed;
99

1010
#[cfg(any(feature = "std", feature = "alloc"))]
11-
use crate::__private::size_hint;
11+
use crate::de::size_hint;
1212

1313
////////////////////////////////////////////////////////////////////////////////
1414

serde/src/de/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ pub mod value;
122122
mod format;
123123
mod ignored_any;
124124
mod impls;
125+
pub(crate) mod size_hint;
125126
mod utf8;
126127

127128
pub use self::ignored_any::IgnoredAny;
File renamed without changes.

serde/src/de/value.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
use crate::lib::*;
2525

2626
use self::private::{First, Second};
27-
use crate::__private::size_hint;
28-
use crate::de::{self, Deserializer, Expected, IntoDeserializer, SeqAccess, Visitor};
27+
use crate::de::{self, size_hint, Deserializer, Expected, IntoDeserializer, SeqAccess, Visitor};
2928
use crate::ser;
3029

3130
////////////////////////////////////////////////////////////////////////////////

serde/src/private/de.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,11 @@ mod content {
208208

209209
use crate::lib::*;
210210

211-
use crate::__private::size_hint;
212211
use crate::actually_private;
213212
use crate::de::value::{MapDeserializer, SeqDeserializer};
214213
use crate::de::{
215-
self, Deserialize, DeserializeSeed, Deserializer, EnumAccess, Expected, IgnoredAny,
216-
MapAccess, SeqAccess, Unexpected, Visitor,
214+
self, size_hint, Deserialize, DeserializeSeed, Deserializer, EnumAccess, Expected,
215+
IgnoredAny, MapAccess, SeqAccess, Unexpected, Visitor,
217216
};
218217

219218
/// Used from generated code to buffer the contents of the Deserializer when

serde/src/private/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ pub mod de;
33
#[cfg(not(no_serde_derive))]
44
pub mod ser;
55

6-
pub mod size_hint;
7-
86
// FIXME: #[cfg(doctest)] once https://github.com/rust-lang/rust/issues/67295 is fixed.
97
pub mod doc;
108

0 commit comments

Comments
 (0)