From a8db75099bd8dcd2e90b077b087be06f1d479c2f Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Tue, 24 Aug 2021 22:48:39 -0600 Subject: [PATCH] fix for volumeid serializer --- appmgr/src/volume/mod.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/appmgr/src/volume/mod.rs b/appmgr/src/volume/mod.rs index 373ac17b0..ddd24d970 100644 --- a/appmgr/src/volume/mod.rs +++ b/appmgr/src/volume/mod.rs @@ -17,10 +17,8 @@ pub mod disk; pub const PKG_VOLUME_DIR: &'static str = "/mnt/embassy-os/volumes/package-data"; pub const BACKUP_DIR: &'static str = "/mnt/embassy-os-backups/EmbassyBackups"; -#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize)] -#[serde(untagged)] +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum VolumeId = String> { - #[serde(rename = "BACKUP")] Backup, Custom(Id), } @@ -66,6 +64,14 @@ where }) } } +impl> Serialize for VolumeId { + fn serialize(&self, serializer: Ser) -> Result + where + Ser: serde::Serializer, + { + serializer.serialize_str(self.as_ref()) + } +} #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct Volumes(IndexMap);