aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config/helpers.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/config/helpers.rs b/src/config/helpers.rs
index edf4bd5..ba2e571 100644
--- a/src/config/helpers.rs
+++ b/src/config/helpers.rs
@@ -119,7 +119,7 @@ impl<'de> Deserialize<'de> for super::Program {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
#[derive(Deserialize)]
#[serde(remote = "super::Program")]
- struct Helper {
+ struct ProgramHelper {
#[serde(deserialize_with = "deserialize_box_slice_os_string")]
command: Box<[OsString]>,
#[serde(default, deserialize_with = "deserialize_timeout_opt")]
@@ -128,19 +128,19 @@ impl<'de> Deserialize<'de> for super::Program {
#[derive(Deserialize)]
#[serde(untagged)]
- enum Untagged {
+ enum UntaggedProgram {
#[serde(deserialize_with = "deserialize_box_slice_os_string")]
Short(Box<[OsString]>),
- #[serde(with = "Helper")]
+ #[serde(with = "ProgramHelper")]
Full(super::Program),
}
- Ok(match Untagged::deserialize(deserializer)? {
- Untagged::Short(command) => super::Program {
+ Ok(match UntaggedProgram::deserialize(deserializer)? {
+ UntaggedProgram::Short(command) => super::Program {
command,
timeout: None,
},
- Untagged::Full(program) => program,
+ UntaggedProgram::Full(program) => program,
})
}
}
@@ -149,7 +149,7 @@ impl<'de> Deserialize<'de> for super::Route {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
#[derive(Deserialize)]
#[serde(remote = "super::Route")]
- struct Helper {
+ struct RouteHelper {
programs: Box<[super::Program]>,
#[serde(default, deserialize_with = "deserialize_qos_opt")]
qos: Option<QoS>,
@@ -157,18 +157,18 @@ impl<'de> Deserialize<'de> for super::Route {
#[derive(Deserialize)]
#[serde(untagged)]
- enum Untagged {
+ enum UntaggedRoute {
Short(Box<[super::Program]>),
- #[serde(with = "Helper")]
+ #[serde(with = "RouteHelper")]
Full(super::Route),
}
- Ok(match Untagged::deserialize(deserializer)? {
- Untagged::Short(programs) => super::Route {
+ Ok(match UntaggedRoute::deserialize(deserializer)? {
+ UntaggedRoute::Short(programs) => super::Route {
programs,
qos: None,
},
- Untagged::Full(route) => route,
+ UntaggedRoute::Full(route) => route,
})
}
}