summaryrefslogtreecommitdiffstats
path: root/src/config.rs
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2022-06-24 16:50:02 +0530
committerMartin Geisler <mgeisler@google.com>2022-09-09 16:00:35 +0200
commit66bf85b14f96a65daab0967a24451e1e44aabd2a (patch)
tree7196fde99e6399bc8bbe5e773eb6756fc12555e7 /src/config.rs
parent1a0892745e69551ab545883925e701c0438ec3e6 (diff)
Require Rust 2021 edition
This allows us to clean up and simplify the code.
Diffstat (limited to 'src/config.rs')
-rw-r--r--src/config.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/config.rs b/src/config.rs
index b7d03d1a..6b8f1414 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -49,6 +49,7 @@
#![deny(missing_docs)]
+use log::{debug, trace, warn};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::collections::HashMap;
use std::env;
@@ -295,7 +296,7 @@ impl Default for Config {
}
}
-impl<'de> Deserialize<'de> for Config {
+impl<'de> serde::Deserialize<'de> for Config {
fn deserialize<D: Deserializer<'de>>(de: D) -> std::result::Result<Self, D::Error> {
let raw = Value::deserialize(de)?;
@@ -717,6 +718,7 @@ impl<'de, T> Updateable<'de> for T where T: Serialize + Deserialize<'de> {}
mod tests {
use super::*;
use crate::utils::fs::get_404_output_file;
+ use serde_json::json;
const COMPLEX_CONFIG: &str = r#"
[book]