Skip to content

Commit

Permalink
Remove unnecessary rearrangement of duplicates
Browse files Browse the repository at this point in the history
The rearrangement of duplicates function on file `list.rs` has been removed to simplify the dependency reporting method. Development dependencies will now directly merged without handling duplicates, this allows for cleaner, more straightforward code and potentially better performance. The whitespace inconsistencies across the file have also been fixed.
  • Loading branch information
Barsik-sus committed Apr 23, 2024
1 parent 79de262 commit 54cf222
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions module/move/willbe/src/action/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ mod private
tree_package_report( package.manifest_path().as_std_path().try_into().unwrap(), &mut report, &mut visited )
}
let ListReport::Tree( tree ) = report else { unreachable!() };
let tree = rearrange_duplicates( merge_dev_dependencies( tree ) );
let tree = merge_dev_dependencies( tree );
report = ListReport::Tree( tree );
}
ListFormat::Topological =>
Expand Down Expand Up @@ -558,7 +558,7 @@ mod private

Ok( report )
}

fn merge_dev_dependencies( mut report: Vec< ListNodeReport > ) -> Vec< ListNodeReport >
{
let mut dev_dependencies = vec![];
Expand All @@ -570,10 +570,10 @@ mod private
{
last_report.dev_dependencies = dev_dependencies;
}

report
}

fn merge_dev_dependencies_impl( report : &mut ListNodeReport, mut dev_deps_acc : Vec< ListNodeReport > ) -> Vec< ListNodeReport >
{
for dep in report.normal_dependencies.iter_mut()
Expand All @@ -582,15 +582,15 @@ mod private
{
dev_deps_acc = merge_dev_dependencies_impl( dep, dev_deps_acc );
}

for dep in std::mem::take( &mut report.dev_dependencies )
{
if !dev_deps_acc.contains( &dep )
{
dev_deps_acc.push( dep );
}
}

dev_deps_acc
}

Expand Down Expand Up @@ -620,7 +620,7 @@ mod private
rearrange_duplicates_resolver( &mut node.normal_dependencies, required );
rearrange_duplicates_resolver( &mut node.dev_dependencies, required );
rearrange_duplicates_resolver( &mut node.build_dependencies, required );

if !node.duplicate
{
if let Some( r ) = required.iter_mut().flat_map( |( _, v )| v )
Expand Down

0 comments on commit 54cf222

Please sign in to comment.