Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce compile time contribution of next_key_seed and next_value_seed #436

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Reduce compile time contribution of next_key_seed and next_value_seed #436

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dca59b
factor out common code
s-nie Aug 6, 2024
0360c7d
changelog entry
s-nie Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions src/serde/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,13 +504,8 @@ struct MapDeserializer<'a> {
processed: usize,
}

impl<'de> de::MapAccess<'de> for MapDeserializer<'_> {
type Error = Error;

fn next_key_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>>
where
T: de::DeserializeSeed<'de>,
{
impl<'a> MapDeserializer<'a> {
fn next_key_deserializer(&mut self) -> Result<Option<Deserializer>> {
loop {
match self.pairs.next() {
Some(item) => {
Expand All @@ -526,25 +521,47 @@ impl<'de> de::MapAccess<'de> for MapDeserializer<'_> {
self.value = Some(value);
let visited = Rc::clone(&self.visited);
let key_de = Deserializer::from_parts(key, self.options, visited);
return seed.deserialize(key_de).map(Some);
return Ok(Some(key_de));
}
None => return Ok(None),
}
}
}

fn next_value_seed<T>(&mut self, seed: T) -> Result<T::Value>
where
T: de::DeserializeSeed<'de>,
{
fn next_value_deserializer(&mut self) -> Result<Deserializer> {
match self.value.take() {
Some(value) => {
let visited = Rc::clone(&self.visited);
seed.deserialize(Deserializer::from_parts(value, self.options, visited))
Ok(Deserializer::from_parts(value, self.options, visited))
}
None => Err(de::Error::custom("value is missing")),
}
}
}

impl<'de> de::MapAccess<'de> for MapDeserializer<'_> {
type Error = Error;

fn next_key_seed<T>(&mut self, seed: T) -> Result<Option<T::Value>>
where
T: de::DeserializeSeed<'de>,
{
match self.next_key_deserializer() {
Ok(Some(key_de)) => seed.deserialize(key_de).map(Some),
Ok(None) => Ok(None),
Err(error) => Err(error),
}
Comment on lines +549 to +553
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you prefer I can make this more idiomatic, but in functions that get instantiated a lot, I prefer to keep it simple to keep the generated lines minimal.

}

fn next_value_seed<T>(&mut self, seed: T) -> Result<T::Value>
where
T: de::DeserializeSeed<'de>,
{
match self.next_value_deserializer() {
Ok(value_de) => seed.deserialize(value_de),
Err(error) => Err(error),
}
}

fn size_hint(&self) -> Option<usize> {
match self.pairs.size_hint() {
Expand Down