aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2020-05-23 22:40:45 -0400
committerJesse Luehrs <doy@tozt.net>2020-05-23 23:10:58 -0400
commitffdae54bae2cc9c2e0f704878ff59255dbd787c0 (patch)
tree6bbebbf88631bf1701eb9805c65ad92f4721f1cc /src
parent871bd25407d83d610272c0b6403098c6cd38619a (diff)
downloadrbw-ffdae54bae2cc9c2e0f704878ff59255dbd787c0.tar.gz
rbw-ffdae54bae2cc9c2e0f704878ff59255dbd787c0.zip
set default lock_timeout correctly when first creating config file
Diffstat (limited to 'src')
-rw-r--r--src/config.rs13
-rw-r--r--src/lib.rs1
2 files changed, 13 insertions, 1 deletions
diff --git a/src/config.rs b/src/config.rs
index 6c6c761..d5c1659 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -3,7 +3,7 @@ use crate::prelude::*;
use std::io::{Read as _, Write as _};
use tokio::io::AsyncReadExt as _;
-#[derive(serde::Serialize, serde::Deserialize, Default, Debug)]
+#[derive(serde::Serialize, serde::Deserialize, Debug)]
pub struct Config {
pub email: Option<String>,
pub base_url: Option<String>,
@@ -12,6 +12,17 @@ pub struct Config {
pub lock_timeout: u64,
}
+impl Default for Config {
+ fn default() -> Self {
+ Self {
+ email: Default::default(),
+ base_url: Default::default(),
+ identity_url: Default::default(),
+ lock_timeout: default_lock_timeout(),
+ }
+ }
+}
+
pub fn default_lock_timeout() -> u64 {
3600
}
diff --git a/src/lib.rs b/src/lib.rs
index 6605c22..a458415 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,6 @@
#![warn(clippy::pedantic)]
#![warn(clippy::nursery)]
+#![allow(clippy::default_trait_access)]
#![allow(clippy::large_enum_variant)]
#![allow(clippy::missing_const_for_fn)]
#![allow(clippy::missing_errors_doc)]