Skip to content

Commit

Permalink
Auto merge of #10002 - TaKO8Ki:fix-clippy-warnings, r=ehuss
Browse files Browse the repository at this point in the history
Fix a clippy warning

This pull request fixes a clippy warning.
  • Loading branch information
bors committed Oct 24, 2021
2 parents dc6a1d5 + c3eab8d commit 6c1bc24
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cargo/core/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ impl<'cfg> Workspace<'cfg> {
// but that's not quite right as it won't deal with overlaps.
let mut combined = from_config;
for (url, deps_from_manifest) in from_manifest {
if let Some(deps_from_config) = combined.get_mut(&url) {
if let Some(deps_from_config) = combined.get_mut(url) {
// We want from_config to take precedence for each patched name.
// NOTE: This is inefficient if the number of patches is large!
let mut from_manifest_pruned = deps_from_manifest.clone();
Expand Down

0 comments on commit 6c1bc24

Please sign in to comment.