From afb7a943481a93c33b1c1c5d9056a20c546ae6aa Mon Sep 17 00:00:00 2001 From: Joscha Date: Tue, 8 Aug 2023 23:42:45 +0200 Subject: [PATCH] Reorder structs --- src/config.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/config.rs b/src/config.rs index d950ade..55b9934 100644 --- a/src/config.rs +++ b/src/config.rs @@ -10,6 +10,10 @@ use crate::somehow; mod default { use std::time::Duration; + pub fn web_base() -> String { + "".to_string() + } + pub fn repo_name() -> String { "local repo".to_string() } @@ -17,9 +21,19 @@ mod default { pub fn repo_update_delay() -> Duration { Duration::from_secs(60) } +} - pub fn web_base() -> String { - "".to_string() +#[derive(Debug, Deserialize)] +pub struct Web { + #[serde(default = "default::web_base")] + pub base: String, +} + +impl Default for Web { + fn default() -> Self { + Self { + base: default::web_base(), + } } } @@ -40,20 +54,6 @@ impl Default for Repo { } } -#[derive(Debug, Deserialize)] -pub struct Web { - #[serde(default = "default::web_base")] - pub base: String, -} - -impl Default for Web { - fn default() -> Self { - Self { - base: default::web_base(), - } - } -} - #[derive(Debug, Default, Deserialize)] struct ConfigFile { repo: Repo,