File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -163,10 +163,10 @@ impl Snapshot {
163
163
// `Directory` structure. Only `Dir+Dir` collisions are legal.
164
164
let path_stats = {
165
165
let mut uniq_paths: IndexMap < PathBuf , PathStat > = IndexMap :: new ( ) ;
166
- for path_stat in snapshots
166
+ for path_stat in Itertools :: flatten ( snapshots
167
167
. iter ( )
168
168
. map ( |s| s. path_stats . iter ( ) . cloned ( ) )
169
- . flatten ( )
169
+ )
170
170
{
171
171
match uniq_paths. entry ( path_stat. path ( ) . to_owned ( ) ) {
172
172
indexmap:: map:: Entry :: Occupied ( e) => match ( & path_stat, e. get ( ) ) {
@@ -223,10 +223,10 @@ impl Snapshot {
223
223
224
224
// Merge FileNodes.
225
225
out_dir. set_files ( protobuf:: RepeatedField :: from_vec (
226
- directories
226
+ Itertools :: flatten ( directories
227
227
. iter_mut ( )
228
228
. map ( |directory| directory. take_files ( ) . into_iter ( ) )
229
- . flatten ( )
229
+ )
230
230
. collect ( ) ,
231
231
) ) ;
232
232
out_dir. mut_files ( ) . sort_by ( |a, b| a. name . cmp ( & b. name ) ) ;
@@ -253,10 +253,10 @@ impl Snapshot {
253
253
254
254
// Group and recurse for DirectoryNodes.
255
255
let sorted_child_directories = {
256
- let mut merged_directories = directories
256
+ let mut merged_directories = Itertools :: flatten ( directories
257
257
. iter_mut ( )
258
258
. map ( |directory| directory. take_directories ( ) . into_iter ( ) )
259
- . flatten ( )
259
+ )
260
260
. collect :: < Vec < _ > > ( ) ;
261
261
merged_directories. sort_by ( |a, b| a. name . cmp ( & b. name ) ) ;
262
262
merged_directories
You can’t perform that action at this time.
0 commit comments