aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/mozart
diff options
context:
space:
mode:
Diffstat (limited to 'crates/mozart')
-rw-r--r--crates/mozart/src/commands/create_project.rs10
-rw-r--r--crates/mozart/src/commands/remove.rs24
-rw-r--r--crates/mozart/src/commands/require.rs14
-rw-r--r--crates/mozart/src/commands/update.rs12
-rw-r--r--crates/mozart/tests/installer.rs4
5 files changed, 62 insertions, 2 deletions
diff --git a/crates/mozart/src/commands/create_project.rs b/crates/mozart/src/commands/create_project.rs
index 92081d0..af77ba6 100644
--- a/crates/mozart/src/commands/create_project.rs
+++ b/crates/mozart/src/commands/create_project.rs
@@ -424,6 +424,16 @@ pub async fn execute(
),
temporary_constraints: HashMap::new(),
raw_repositories: raw.repositories.clone(),
+ root_provide: raw
+ .provide
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
+ root_replace: raw
+ .replace
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
};
console.info("Resolving dependencies...");
diff --git a/crates/mozart/src/commands/remove.rs b/crates/mozart/src/commands/remove.rs
index 58917e9..20cb6a2 100644
--- a/crates/mozart/src/commands/remove.rs
+++ b/crates/mozart/src/commands/remove.rs
@@ -258,6 +258,16 @@ pub async fn execute(
),
temporary_constraints: HashMap::new(),
raw_repositories: raw.repositories.clone(),
+ root_provide: raw
+ .provide
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
+ root_replace: raw
+ .replace
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
};
// Print header messages
@@ -518,6 +528,16 @@ async fn remove_unused(
),
temporary_constraints: HashMap::new(),
raw_repositories: raw.repositories.clone(),
+ root_provide: raw
+ .provide
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
+ root_replace: raw
+ .replace
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
};
console.info("Resolving dependencies to detect unused packages...");
@@ -866,6 +886,8 @@ mod tests {
),
temporary_constraints: HashMap::new(),
raw_repositories: vec![],
+ root_provide: HashMap::new(),
+ root_replace: HashMap::new(),
};
let resolved = resolve(&request)
.await
@@ -917,6 +939,8 @@ mod tests {
),
temporary_constraints: HashMap::new(),
raw_repositories: vec![],
+ root_provide: HashMap::new(),
+ root_replace: HashMap::new(),
};
let resolved2 = resolve(&request2)
.await
diff --git a/crates/mozart/src/commands/require.rs b/crates/mozart/src/commands/require.rs
index 630d960..95b26ea 100644
--- a/crates/mozart/src/commands/require.rs
+++ b/crates/mozart/src/commands/require.rs
@@ -647,6 +647,16 @@ pub async fn execute(
),
temporary_constraints: HashMap::new(),
raw_repositories: raw.repositories.clone(),
+ root_provide: raw
+ .provide
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
+ root_replace: raw
+ .replace
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
};
// Print header messages
@@ -1042,6 +1052,8 @@ mod tests {
),
temporary_constraints: HashMap::new(),
raw_repositories: vec![],
+ root_provide: HashMap::new(),
+ root_replace: HashMap::new(),
};
let resolved = resolver::resolve(&request)
@@ -1110,6 +1122,8 @@ mod tests {
),
temporary_constraints: HashMap::new(),
raw_repositories: vec![],
+ root_provide: HashMap::new(),
+ root_replace: HashMap::new(),
};
let resolved = resolver::resolve(&request)
diff --git a/crates/mozart/src/commands/update.rs b/crates/mozart/src/commands/update.rs
index 847ccf7..33b305a 100644
--- a/crates/mozart/src/commands/update.rs
+++ b/crates/mozart/src/commands/update.rs
@@ -887,6 +887,16 @@ pub async fn run(
repositories: repositories.clone(),
temporary_constraints,
raw_repositories: composer_json.repositories.clone(),
+ root_provide: composer_json
+ .provide
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
+ root_replace: composer_json
+ .replace
+ .iter()
+ .map(|(k, v)| (k.clone(), v.clone()))
+ .collect(),
};
// Step 6: Print header and run resolver
@@ -1994,6 +2004,8 @@ mod tests {
),
temporary_constraints: HashMap::new(),
raw_repositories: vec![],
+ root_provide: HashMap::new(),
+ root_replace: HashMap::new(),
};
let resolved = resolve(&request).await.expect("Resolution should succeed");
diff --git a/crates/mozart/tests/installer.rs b/crates/mozart/tests/installer.rs
index fcb29c1..99ef2d8 100644
--- a/crates/mozart/tests/installer.rs
+++ b/crates/mozart/tests/installer.rs
@@ -327,7 +327,7 @@ installer_fixture!(
provider_packages_can_not_be_installed_unless_selected,
ignore
);
-installer_fixture!(provider_satisfies_its_own_requirement, ignore);
+installer_fixture!(provider_satisfies_its_own_requirement);
installer_fixture!(remove_deletes_unused_deps);
installer_fixture!(
remove_does_nothing_if_removal_requires_update_of_dep,
@@ -342,7 +342,7 @@ installer_fixture!(
replaced_packages_should_not_be_installed_when_installing_from_lock,
ignore
);
-installer_fixture!(replacer_satisfies_its_own_requirement, ignore);
+installer_fixture!(replacer_satisfies_its_own_requirement);
installer_fixture!(repositories_priorities, ignore);
installer_fixture!(repositories_priorities2, ignore);
installer_fixture!(repositories_priorities3, ignore);