Skip to content

Commit 07e2d52

Browse files
committed
Remove Config dependency from resolve
1 parent 2eacc64 commit 07e2d52

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

murek/src/ops/resolve.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use anyhow::Result;
44

55
use crate::core::package::{Package, PackageId};
66
use crate::core::registry::cache::RegistryCache;
7-
use crate::core::registry::Registry;
87
use crate::core::registry::source_map::SourceMap;
8+
use crate::core::registry::Registry;
99
use crate::core::resolver::Resolve;
1010
use crate::core::workspace::Workspace;
1111
use crate::internal::asyncx::AwaitSync;
@@ -32,8 +32,7 @@ pub fn resolve_workspace(ws: &Workspace<'_>) -> Result<WorkspaceResolution> {
3232
.map(|pkg| pkg.manifest.summary.clone())
3333
.collect::<Vec<_>>();
3434

35-
let resolve =
36-
resolver::resolve(&members_summaries, &mut registry_cache, ws.config()).await?;
35+
let resolve = resolver::resolve(&members_summaries, &mut registry_cache).await?;
3736

3837
// Gather [`Package`] instances from this resolver result, by asking the [`RegistryCache`]
3938
// to download resolved packages.

murek/src/resolver/mod.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use petgraph::graphmap::DiGraphMap;
55

66
use crate::core::registry::Registry;
77
use crate::core::resolver::Resolve;
8-
use crate::core::{Config, PackageId, Summary};
8+
use crate::core::{PackageId, Summary};
99

1010
/// Builds the list of all packages required to build the first argument.
1111
///
@@ -20,14 +20,8 @@ use crate::core::{Config, PackageId, Summary};
2020
/// our requests to it (aka returns the same results for the same query every time).
2121
/// It is also advised to implement internal caching, as the resolver may frequently ask
2222
/// repetitive queries.
23-
///
24-
/// * `config` - [`Config`] object.
2523
#[tracing::instrument(level = "trace", skip_all)]
26-
pub async fn resolve(
27-
summaries: &[Summary],
28-
registry: &mut dyn Registry,
29-
_config: &Config,
30-
) -> Result<Resolve> {
24+
pub async fn resolve(summaries: &[Summary], registry: &mut dyn Registry) -> Result<Resolve> {
3125
let mut graph = DiGraphMap::new();
3226

3327
let mut packages: HashMap<_, _> = HashMap::from_iter(

0 commit comments

Comments
 (0)