diff options
author | Quentin Dufour <quentin@deuxfleurs.fr> | 2021-09-20 15:00:31 +0200 |
---|---|---|
committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2021-09-20 15:13:16 +0200 |
commit | 7d478d997620c0af41a6ffb8b3f29dc6dda2cb98 (patch) | |
tree | 03b08b4c27401b46c3e64c53e3469d2803efa3e9 /src/config/runtime.rs | |
parent | 2bbc9109991f8bb79a09a965a1d2779e1749b25b (diff) | |
download | diplonat-7d478d997620c0af41a6ffb8b3f29dc6dda2cb98.tar.gz diplonat-7d478d997620c0af41a6ffb8b3f29dc6dda2cb98.zip |
Stricter Rust formating rules and build in the CI
Diffstat (limited to 'src/config/runtime.rs')
-rw-r--r-- | src/config/runtime.rs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/config/runtime.rs b/src/config/runtime.rs index 0d52b15..eeb34f6 100644 --- a/src/config/runtime.rs +++ b/src/config/runtime.rs @@ -6,8 +6,8 @@ use crate::config::{ConfigOpts, ConfigOptsAcme, ConfigOptsBase, ConfigOptsConsul // This code is inspired by the Trunk crate (https://github.com/thedodd/trunk) -// In this file, we take ConfigOpts and transform them into ready-to-use RuntimeConfig. -// We apply default values and business logic. +// In this file, we take ConfigOpts and transform them into ready-to-use +// RuntimeConfig. We apply default values and business logic. #[derive(Debug)] pub struct RuntimeConfigAcme { @@ -59,12 +59,11 @@ impl RuntimeConfig { impl RuntimeConfigAcme { pub fn new(opts: ConfigOptsAcme) -> Result<Option<Self>> { if !opts.enable { - return Ok(None); + return Ok(None) } let email = opts.email.expect( - "'DIPLONAT_ACME_EMAIL' environment variable is required \ - if 'DIPLONAT_ACME_ENABLE' == 'true'", + "'DIPLONAT_ACME_EMAIL' environment variable is required if 'DIPLONAT_ACME_ENABLE' == 'true'", ); Ok(Some(Self { email })) @@ -105,9 +104,11 @@ impl RuntimeConfigIgd { if refresh_time.as_secs() * 2 > expiration_time.as_secs() { return Err(anyhow!( - "IGD expiration time (currently: {}s) must be at least twice bigger than refresh time (currently: {}s)", - expiration_time.as_secs(), - refresh_time.as_secs())); + "IGD expiration time (currently: {}s) must be at least twice bigger than refresh time \ + (currently: {}s)", + expiration_time.as_secs(), + refresh_time.as_secs() + )) } Ok(Self { |