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

move-package: collect overrides from collect_graphs (refactor) #15801

Merged
merged 1 commit into from
Jan 23, 2024
Merged

move-package: collect overrides from collect_graphs (refactor) #15801

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
move-package: collect overrides from collect_graphs (refactor) 
Moved `collect_overrides` functionality to a more natural place. This is
used for resolve_version hook implementation later so that the manifest
doesn't have to be parsed again.
  • Loading branch information
@kklas
kklas committed Jan 23, 2024
commit 6df80def2653c05180111e87e10a697740b9dfbd
81 changes: 38 additions & 43 deletions external-crates/move/crates/move-package/src/resolution/dependency_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,26 +221,28 @@ impl<Progress: Write> DependencyGraphBuilder<Progress> {
)
})?;
let root_pkg_orig_name = root_manifest.package.name;
let (mut dep_graphs, resolved_name_deps, mut dep_orig_names) = self.collect_graphs(
parent,
root_pkg_name,
root_pkg_orig_name,
root_path.clone(),
DependencyMode::Always,
root_manifest.dependencies.clone(),
)?;
let (mut dep_graphs, resolved_name_deps, mut dep_orig_names, mut overrides) = self
.collect_graphs(
parent,
root_pkg_name,
root_pkg_orig_name,
root_path.clone(),
DependencyMode::Always,
root_manifest.dependencies.clone(),
)?;
let dep_lock_files = dep_graphs
.values()
.map(|graph_info| graph_info.g.write_to_lock(self.install_dir.clone()))
.collect::<Result<Vec<LockFile>>>()?;
let (dev_dep_graphs, dev_resolved_name_deps, dev_dep_orig_names) = self.collect_graphs(
parent,
root_pkg_name,
root_pkg_orig_name,
root_path.clone(),
DependencyMode::DevOnly,
root_manifest.dev_dependencies.clone(),
)?;
let (dev_dep_graphs, dev_resolved_name_deps, dev_dep_orig_names, dev_overrides) = self
.collect_graphs(
parent,
root_pkg_name,
root_pkg_orig_name,
root_path.clone(),
DependencyMode::DevOnly,
root_manifest.dev_dependencies.clone(),
)?;

let dev_dep_lock_files = dev_dep_graphs
.values()
Expand Down Expand Up @@ -284,10 +286,6 @@ impl<Progress: Write> DependencyGraphBuilder<Progress> {
.package_graph
.add_node(combined_graph.root_package);

// get overrides
let mut overrides = collect_overrides(parent, &resolved_name_deps)?;
let dev_overrides = collect_overrides(parent, &dev_resolved_name_deps)?;

for (
dep_name,
DependencyGraphInfo {
Expand Down Expand Up @@ -345,10 +343,12 @@ impl<Progress: Write> DependencyGraphBuilder<Progress> {
BTreeMap<PM::PackageName, DependencyGraphInfo>,
PM::Dependencies,
BTreeMap<Symbol, PM::PackageName>,
BTreeMap<Symbol, Package>,
)> {
let mut dep_graphs = BTreeMap::new();
let mut resolved_name_deps = PM::Dependencies::new();
let mut dep_orig_names = BTreeMap::new();
let mut overrides = BTreeMap::new();
for (dep_pkg_name, dep) in dependencies {
let (pkg_graph, is_override, is_external, resolved_pkg_name) = self
.new_for_dep(
Expand All @@ -369,10 +369,26 @@ impl<Progress: Write> DependencyGraphBuilder<Progress> {
resolved_pkg_name,
DependencyGraphInfo::new(pkg_graph, mode, is_override, is_external),
);
resolved_name_deps.insert(resolved_pkg_name, dep);
resolved_name_deps.insert(resolved_pkg_name, dep.clone());
dep_orig_names.insert(resolved_pkg_name, dep_pkg_name);

if is_override {
let kind = match dep {
PM::Dependency::Internal(d) => d.kind,
PM::Dependency::External(_) => {
// external dependencies cannot be overrides
panic!("Unexpected external dependency override")
}
};
let mut dep_pkg = Package {
kind,
resolver: None,
};
dep_pkg.kind.reroot(parent)?;
overrides.insert(resolved_pkg_name, dep_pkg);
}
}
Ok((dep_graphs, resolved_name_deps, dep_orig_names))
Ok((dep_graphs, resolved_name_deps, dep_orig_names, overrides))
}

/// Given a dependency in the parent's manifest file, creates a sub-graph for this dependency.
Expand Down Expand Up @@ -1615,27 +1631,6 @@ fn deps_equal<'a>(
}
}

/// Collects overridden dependencies.
fn collect_overrides(
parent: &PM::DependencyKind,
dependencies: &PM::Dependencies,
) -> Result<BTreeMap<Symbol, Package>> {
let mut overrides = BTreeMap::new();
for (dep_pkg_name, dep) in dependencies {
if let PM::Dependency::Internal(internal) = dep {
if internal.dep_override {
let mut dep_pkg = Package {
kind: internal.kind.clone(),
resolver: None,
};
dep_pkg.kind.reroot(parent)?;
overrides.insert(*dep_pkg_name, dep_pkg);
}
}
}
Ok(overrides)
}

/// Cycle detection to avoid infinite recursion due to the way we construct internally resolved
/// sub-graphs, expecting to end recursion at leaf packages that have no dependencies.
fn check_for_dep_cycles(
Expand Down
Loading