diff options
Diffstat (limited to 'crates/mozart-registry')
| -rw-r--r-- | crates/mozart-registry/src/installer_executor/trace_recorder.rs | 5 | ||||
| -rw-r--r-- | crates/mozart-registry/src/lockfile.rs | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/crates/mozart-registry/src/installer_executor/trace_recorder.rs b/crates/mozart-registry/src/installer_executor/trace_recorder.rs index 9fdc91b..c924d73 100644 --- a/crates/mozart-registry/src/installer_executor/trace_recorder.rs +++ b/crates/mozart-registry/src/installer_executor/trace_recorder.rs @@ -12,7 +12,7 @@ //! - Install: `Installing <name> (<version>)` //! - Update (upgrade direction): `Upgrading <name> (<oldVersion> => <newVersion>)` //! - Update (downgrade direction): `Downgrading <name> (<oldVersion> => <newVersion>)` -//! - Uninstall: `Uninstalling <name> (<version>)` +//! - Uninstall: `Removing <name> (<version>)` use mozart_semver::Version; @@ -85,8 +85,7 @@ impl InstallerExecutor for TraceRecorderExecutor { version: &str, _ctx: &ExecuteContext, ) -> anyhow::Result<()> { - self.trace - .push(format!("Uninstalling {} ({})", name, version)); + self.trace.push(format!("Removing {} ({})", name, version)); Ok(()) } } diff --git a/crates/mozart-registry/src/lockfile.rs b/crates/mozart-registry/src/lockfile.rs index 8022f8b..075848f 100644 --- a/crates/mozart-registry/src/lockfile.rs +++ b/crates/mozart-registry/src/lockfile.rs @@ -85,6 +85,12 @@ pub struct LockedPackage { #[serde(default, skip_serializing_if = "BTreeMap::is_empty")] pub conflict: BTreeMap<String, String>, + #[serde(default, skip_serializing_if = "BTreeMap::is_empty")] + pub provide: BTreeMap<String, String>, + + #[serde(default, skip_serializing_if = "BTreeMap::is_empty")] + pub replace: BTreeMap<String, String>, + #[serde(skip_serializing_if = "Option::is_none")] pub suggest: Option<BTreeMap<String, String>>, @@ -410,6 +416,8 @@ fn packagist_version_to_locked_package(name: &str, pv: &PackagistVersion) -> Loc require: pv.require.clone(), require_dev: pv.require_dev.clone(), conflict: pv.conflict.clone(), + provide: pv.provide.clone(), + replace: pv.replace.clone(), suggest: pv.suggest.clone(), package_type: pv.package_type.clone(), autoload: pv.autoload.clone(), @@ -671,6 +679,8 @@ mod tests { require: BTreeMap::new(), require_dev: BTreeMap::new(), conflict: BTreeMap::new(), + provide: BTreeMap::new(), + replace: BTreeMap::new(), suggest: None, package_type: Some("library".to_string()), autoload: None, @@ -1121,6 +1131,8 @@ mod tests { require: BTreeMap::new(), require_dev: BTreeMap::new(), conflict: BTreeMap::new(), + provide: BTreeMap::new(), + replace: BTreeMap::new(), suggest: None, package_type: None, autoload: None, @@ -1144,6 +1156,8 @@ mod tests { require: BTreeMap::new(), require_dev: BTreeMap::new(), conflict: BTreeMap::new(), + provide: BTreeMap::new(), + replace: BTreeMap::new(), suggest: None, package_type: None, autoload: None, @@ -1270,6 +1284,8 @@ mod tests { require: BTreeMap::new(), require_dev: BTreeMap::new(), conflict: BTreeMap::new(), + provide: BTreeMap::new(), + replace: BTreeMap::new(), suggest: None, package_type: Some("library".to_string()), autoload: None, |