Option.. => Partial..

pull/17/head
ZSchoen 3 years ago
parent 3c6d182109
commit 11019a2799

@ -10,7 +10,7 @@ pub struct Remote {
} }
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
struct OptionRemote { struct PartialRemote {
pub name: Option<String>, pub name: Option<String>,
pub host: String, pub host: String,
pub user: String, pub user: String,
@ -30,8 +30,8 @@ impl Default for Remote {
} }
} }
impl From<OptionRemote> for Remote { impl From<PartialRemote> for Remote {
fn from(minimal_remote: OptionRemote) -> Self { fn from(minimal_remote: PartialRemote) -> Self {
let default = Remote::default(); let default = Remote::default();
let name = minimal_remote.name.unwrap_or(default.name); let name = minimal_remote.name.unwrap_or(default.name);
let ssh_port = minimal_remote.ssh_port.unwrap_or(default.ssh_port); let ssh_port = minimal_remote.ssh_port.unwrap_or(default.ssh_port);
@ -51,7 +51,7 @@ impl<'de> Deserialize<'de> for Remote {
where where
D: serde::Deserializer<'de>, D: serde::Deserializer<'de>,
{ {
OptionRemote::deserialize(deserializer).map(Self::from) PartialRemote::deserialize(deserializer).map(Self::from)
} }
} }

Loading…
Cancel
Save