itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

use option replace

Browse Source
This commit is contained in:
Jacob Finkelman 2025-01-09 18:28:43 +00:00
parent 5e9f7214a0
commit 92f096362c
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/cargo/core/resolver/mod.rs
View File

@ -59,7 +59,6 @@
//! over the place. //! over the place.
use std::collections::{BTreeMap, HashMap, HashSet}; use std::collections::{BTreeMap, HashMap, HashSet};
use std::mem;
use std::rc::Rc; use std::rc::Rc;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
@ -757,22 +756,8 @@ impl RemainingCandidates {
) -> Option<(Summary, bool)> { ) -> Option<(Summary, bool)> {
for b in self.remaining.iter() { for b in self.remaining.iter() {
let b_id = b.package_id(); let b_id = b.package_id();
// The `links` key in the manifest dictates that there's only one
// package in a dependency graph, globally, with that particular
// `links` key. If this candidate links to something that's already
// linked to by a different package then we've gotta skip this.
if let Some(link) = b.links() {
if let Some(&a) = cx.links.get(&link) {
if a != b_id {
conflicting_prev_active
.entry(a)
.or_insert_with(|| ConflictReason::Links(link));
continue;
}
}
}
// Otherwise the condition for being a valid candidate relies on // The condition for being a valid candidate relies on
// semver. Cargo dictates that you can't duplicate multiple // semver. Cargo dictates that you can't duplicate multiple
// semver-compatible versions of a crate. For example we can't // semver-compatible versions of a crate. For example we can't
// simultaneously activate `foo 1.0.2` and `foo 1.2.0`. We can, // simultaneously activate `foo 1.0.2` and `foo 1.2.0`. We can,
@ -789,12 +774,27 @@ impl RemainingCandidates {
} }
} }
// Otherwise the `links` key in the manifest dictates that there's only one
// package in a dependency graph, globally, with that particular
// `links` key. If this candidate links to something that's already
// linked to by a different package then we've gotta skip this.
if let Some(link) = b.links() {
if let Some(&a) = cx.links.get(&link) {
if a != b_id {
conflicting_prev_active
.entry(a)
.or_insert_with(|| ConflictReason::Links(link));
continue;
}
}
}
// Well if we made it this far then we've got a valid dependency. We // Well if we made it this far then we've got a valid dependency. We
// want this iterator to be inherently "peekable" so we don't // want this iterator to be inherently "peekable" so we don't
// necessarily return the item just yet. Instead we stash it away to // necessarily return the item just yet. Instead we stash it away to
// get returned later, and if we replaced something then that was // get returned later, and if we replaced something then that was
// actually the candidate to try first so we return that. // actually the candidate to try first so we return that.
if let Some(r) = mem::replace(&mut self.has_another, Some(b.clone())) { if let Some(r) = self.has_another.replace(b.clone()) {
return Some((r, true)); return Some((r, true));
} }
} }