Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

restructure Activations for better clone #5147

Closed
wants to merge 1 commit into from
Closed

restructure Activations for better clone #5147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/cargo/core/resolver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ struct Context {
warnings: RcList<String>,
}

type Activations = HashMap<InternedString, HashMap<SourceId, Rc<Vec<Summary>>>>;
type Activations = HashMap<(InternedString, SourceId), Rc<Vec<Summary>>>;

/// Builds the list of all packages required to build the first argument.
pub fn resolve(summaries: &[(Summary, Method)],
Expand Down Expand Up @@ -389,7 +389,6 @@ pub fn resolve(summaries: &[(Summary, Method)],
};

for summary in cx.activations.values()
.flat_map(|v| v.values())
.flat_map(|v| v.iter()) {
let cksum = summary.checksum().map(|s| s.to_string());
resolve.checksums.insert(summary.package_id().clone(), cksum);
Expand Down Expand Up @@ -1305,9 +1304,7 @@ impl Context {
method: &Method) -> CargoResult<bool> {
let id = summary.package_id();
let prev = self.activations
.entry(InternedString::new(id.name()))
.or_insert_with(HashMap::new)
.entry(id.source_id().clone())
.entry((InternedString::new(id.name()), id.source_id().clone()))
.or_insert_with(||Rc::new(Vec::new()));
if !prev.iter().any(|c| c == summary) {
self.resolve_graph.push(GraphNode::Add(id.clone()));
Expand Down Expand Up @@ -1368,15 +1365,13 @@ impl Context {
}

fn prev_active(&self, dep: &Dependency) -> &[Summary] {
self.activations.get(&InternedString::new(dep.name()))
.and_then(|v| v.get(dep.source_id()))
self.activations.get(&(InternedString::new(dep.name()), dep.source_id().clone()))
.map(|v| &v[..])
.unwrap_or(&[])
}

fn is_active(&self, id: &PackageId) -> bool {
self.activations.get(&InternedString::new(id.name()))
.and_then(|v| v.get(id.source_id()))
self.activations.get(&(InternedString::new(id.name()), id.source_id().clone()))
.map(|v| v.iter().any(|s| s.package_id() == id))
.unwrap_or(false)
}
Expand Down Expand Up @@ -1484,7 +1479,6 @@ impl Context {
fn check_cycles(resolve: &Resolve, activations: &Activations)
-> CargoResult<()> {
let summaries: HashMap<&PackageId, &Summary> = activations.values()
.flat_map(|v| v.values())
.flat_map(|v| v.iter())
.map(|s| (s.package_id(), s))
.collect();
Expand Down