Skip to content

Commit 6b3777b

Browse files
committed
Remove len hint specialization
1 parent 7350b58 commit 6b3777b

2 files changed

Lines changed: 3 additions & 32 deletions

File tree

‎serde/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
// discussion of these features please refer to this issue:
9090
//
9191
// https://github.com/serde-rs/serde/issues/812
92-
#![cfg_attr(feature = "unstable", feature(specialization, never_type))]
92+
#![cfg_attr(feature = "unstable", feature(never_type))]
9393
#![allow(unknown_lints, bare_trait_objects, deprecated)]
9494
#![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
9595
#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]

‎serde/src/ser/mod.rs‎

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ pub trait Serializer: Sized {
12781278
<I as IntoIterator>::Item: Serialize,
12791279
{
12801280
let iter = iter.into_iter();
1281-
let mut serializer = try!(self.serialize_seq(iter.len_hint()));
1281+
let mut serializer = try!(self.serialize_seq(iterator_len_hint(&iter)));
12821282
for item in iter {
12831283
try!(serializer.serialize_element(&item));
12841284
}
@@ -1318,7 +1318,7 @@ pub trait Serializer: Sized {
13181318
I: IntoIterator<Item = (K, V)>,
13191319
{
13201320
let iter = iter.into_iter();
1321-
let mut serializer = try!(self.serialize_map(iter.len_hint()));
1321+
let mut serializer = try!(self.serialize_map(iterator_len_hint(&iter)));
13221322
for (key, value) in iter {
13231323
try!(serializer.serialize_entry(&key, &value));
13241324
}
@@ -1953,35 +1953,6 @@ pub trait SerializeStructVariant {
19531953
fn end(self) -> Result<Self::Ok, Self::Error>;
19541954
}
19551955

1956-
trait LenHint: Iterator {
1957-
fn len_hint(&self) -> Option<usize>;
1958-
}
1959-
1960-
impl<I> LenHint for I
1961-
where
1962-
I: Iterator,
1963-
{
1964-
#[cfg(not(feature = "unstable"))]
1965-
fn len_hint(&self) -> Option<usize> {
1966-
iterator_len_hint(self)
1967-
}
1968-
1969-
#[cfg(feature = "unstable")]
1970-
default fn len_hint(&self) -> Option<usize> {
1971-
iterator_len_hint(self)
1972-
}
1973-
}
1974-
1975-
#[cfg(feature = "unstable")]
1976-
impl<I> LenHint for I
1977-
where
1978-
I: ExactSizeIterator,
1979-
{
1980-
fn len_hint(&self) -> Option<usize> {
1981-
Some(self.len())
1982-
}
1983-
}
1984-
19851956
fn iterator_len_hint<I>(iter: &I) -> Option<usize>
19861957
where
19871958
I: Iterator,

0 commit comments

Comments
 (0)