replace copied wit filter_map for rustc 1.35 compatibility (#354)

master
Maxim Vorobjov 2019-11-01 17:58:09 +03:00 committed by Alex Crichton
parent 4673cfd797
commit 1e6bfbca98
1 changed files with 2 additions and 4 deletions

View File

@ -432,8 +432,7 @@ impl<'de, 'b> de::MapAccess<'de> for MapVisitor<'de, 'b> {
}
entries[start..]
.iter()
.copied()
.filter(|i| *i < self.max)
.filter_map(|i| if *i < self.max { Some(*i) } else { None })
.map(|i| (i, &self.tables[i]))
.find(|(_, table)| table.values.is_some())
.map(|p| p.0)
@ -572,8 +571,7 @@ impl<'de, 'b> de::SeqAccess<'de> for MapVisitor<'de, 'b> {
}
entries[start..]
.iter()
.copied()
.filter(|i| *i < self.max)
.filter_map(|i| if *i < self.max { Some(*i) } else { None })
.map(|i| (i, &self.tables[i]))
.find(|(_, table)| table.array)
.map(|p| p.0)