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

toml-rs · Nov 1, 2019 · 1e6bfbc · 1e6bfbc
1 parent 4673cfd
commit 1e6bfbc
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/de.rs b/src/de.rs
@@ -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)