File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -911,7 +911,12 @@ fn lock(
911
911
} )
912
912
}
913
913
914
- /// This is a helper for selecting the summary, or generating a helpful error message.
914
+ /// A helper for selecting the summary, or generating a helpful error message.
915
+ ///
916
+ /// Returns a tuple that the first element is the summary selected. The second
917
+ /// is a package ID indicating that the patch entry should be unlocked. This
918
+ /// happens when a match cannot be found with the `locked` one, but found one
919
+ /// via the original patch, so we need to inform the resolver to "unlock" it.
915
920
fn summary_for_patch (
916
921
orig_patch : & Dependency ,
917
922
locked : & Option < LockedPatchDependency > ,
@@ -961,9 +966,6 @@ fn summary_for_patch(
961
966
let orig_matches = orig_matches. into_iter ( ) . map ( |s| s. into_summary ( ) ) . collect ( ) ;
962
967
963
968
let summary = ready ! ( summary_for_patch( orig_patch, & None , orig_matches, source) ) ?;
964
-
965
- // The unlocked version found a match. This returns a value to
966
- // indicate that this entry should be unlocked.
967
969
return Poll :: Ready ( Ok ( ( summary. 0 , Some ( locked. package_id ) ) ) ) ;
968
970
}
969
971
// Try checking if there are *any* packages that match this by name.
You can’t perform that action at this time.
0 commit comments