Skip to content

Commit dabfc60

Browse files
committed
Switch to explicit usage of Itertools::flatten to fix rust-lang/rust#48919.
1 parent ab3bb0d commit dabfc60

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/rust/engine/fs/src/snapshot.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ impl Snapshot {
163163
// `Directory` structure. Only `Dir+Dir` collisions are legal.
164164
let path_stats = {
165165
let mut uniq_paths: IndexMap<PathBuf, PathStat> = IndexMap::new();
166-
for path_stat in snapshots
166+
for path_stat in Itertools::flatten(snapshots
167167
.iter()
168168
.map(|s| s.path_stats.iter().cloned())
169-
.flatten()
169+
)
170170
{
171171
match uniq_paths.entry(path_stat.path().to_owned()) {
172172
indexmap::map::Entry::Occupied(e) => match (&path_stat, e.get()) {
@@ -223,10 +223,10 @@ impl Snapshot {
223223

224224
// Merge FileNodes.
225225
out_dir.set_files(protobuf::RepeatedField::from_vec(
226-
directories
226+
Itertools::flatten(directories
227227
.iter_mut()
228228
.map(|directory| directory.take_files().into_iter())
229-
.flatten()
229+
)
230230
.collect(),
231231
));
232232
out_dir.mut_files().sort_by(|a, b| a.name.cmp(&b.name));
@@ -253,10 +253,10 @@ impl Snapshot {
253253

254254
// Group and recurse for DirectoryNodes.
255255
let sorted_child_directories = {
256-
let mut merged_directories = directories
256+
let mut merged_directories = Itertools::flatten(directories
257257
.iter_mut()
258258
.map(|directory| directory.take_directories().into_iter())
259-
.flatten()
259+
)
260260
.collect::<Vec<_>>();
261261
merged_directories.sort_by(|a, b| a.name.cmp(&b.name));
262262
merged_directories

0 commit comments

Comments
 (0)