From 6dcddafcd4bf3784c2da8d89b5406f08cdc57379 Mon Sep 17 00:00:00 2001 From: Lucy C <12953208+elvece@users.noreply.github.com> Date: Mon, 11 Oct 2021 15:13:23 -0600 Subject: [PATCH] update breakage response type (#642) --- appmgr/src/config/mod.rs | 5 +---- appmgr/src/control.rs | 5 +---- appmgr/src/dependencies.rs | 5 +---- appmgr/src/install/mod.rs | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/appmgr/src/config/mod.rs b/appmgr/src/config/mod.rs index 4b39c055b..958e77520 100644 --- a/appmgr/src/config/mod.rs +++ b/appmgr/src/config/mod.rs @@ -230,10 +230,7 @@ pub async fn set_dry( .configured() .put(&mut tx, &true) .await?; - Ok(BreakageRes { - patch: tx.abort().await?, - breakages, - }) + Ok(BreakageRes(breakages)) } pub async fn set_impl( diff --git a/appmgr/src/control.rs b/appmgr/src/control.rs index 261181afa..fbaa6c5ab 100644 --- a/appmgr/src/control.rs +++ b/appmgr/src/control.rs @@ -111,10 +111,7 @@ pub async fn stop_dry( let mut breakages = BTreeMap::new(); stop_common(&mut tx, &id, &mut breakages).await?; - Ok(BreakageRes { - breakages, - patch: tx.abort().await?, - }) + Ok(BreakageRes(breakages)) } pub async fn stop_impl(ctx: RpcContext, id: PackageId) -> Result, Error> { diff --git a/appmgr/src/dependencies.rs b/appmgr/src/dependencies.rs index ce73e8d07..807ed6cdf 100644 --- a/appmgr/src/dependencies.rs +++ b/appmgr/src/dependencies.rs @@ -323,10 +323,7 @@ pub struct TaggedDependencyError { #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(rename_all = "kebab-case")] -pub struct BreakageRes { - pub patch: DiffPatch, - pub breakages: BTreeMap, -} +pub struct BreakageRes(pub BTreeMap); #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct Dependencies(pub BTreeMap); diff --git a/appmgr/src/install/mod.rs b/appmgr/src/install/mod.rs index bf5983c10..17dc1502c 100644 --- a/appmgr/src/install/mod.rs +++ b/appmgr/src/install/mod.rs @@ -142,10 +142,7 @@ pub async fn uninstall_dry( break_all_dependents_transitive(&mut tx, &id, DependencyError::NotInstalled, &mut breakages) .await?; - Ok(BreakageRes { - breakages, - patch: tx.abort().await?, - }) + Ok(BreakageRes(breakages)) } pub async fn uninstall_impl(ctx: RpcContext, id: PackageId) -> Result, Error> {