diff --git a/src/config.rs b/src/config.rs index 290d31b1..f2baf90a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -6,7 +6,7 @@ use std::fs::File; use std::io; use std::io::prelude::*; -#[derive(Clone, Debug, Serialize, PartialEq, Eq)] +#[derive(Clone, Debug, Serialize, PartialEq)] pub struct Config { #[serde(flatten)] pub srv: SrvConfig, diff --git a/src/lib.rs b/src/lib.rs index 1d563806..36cf431c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,7 @@ +// Bounds struct derives PartialEq, but not Eq, +// so all containing types must also derive PartialEq without Eq +#![allow(clippy::derive_partial_eq_without_eq)] + pub mod config; pub mod pg; pub mod source; diff --git a/src/pg/config.rs b/src/pg/config.rs index 68d53f6c..afc046b1 100644 --- a/src/pg/config.rs +++ b/src/pg/config.rs @@ -22,7 +22,7 @@ pub struct PgArgs { pub pool_size: Option, } -#[derive(Clone, Debug, Serialize, PartialEq, Eq)] +#[derive(Clone, Debug, Serialize, PartialEq)] pub struct PgConfig { pub connection_string: String, pub ca_root_file: Option, diff --git a/src/pg/function_source.rs b/src/pg/function_source.rs index e479e980..52a33b96 100644 --- a/src/pg/function_source.rs +++ b/src/pg/function_source.rs @@ -9,7 +9,7 @@ use std::collections::HashMap; use std::io; use tilejson::{tilejson, Bounds, TileJSON}; -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] pub struct FunctionSource { /// Function source id pub id: String, diff --git a/src/pg/table_source.rs b/src/pg/table_source.rs index 6188659b..abc277d8 100644 --- a/src/pg/table_source.rs +++ b/src/pg/table_source.rs @@ -11,7 +11,7 @@ use std::collections::{HashMap, HashSet}; use std::io; use tilejson::{tilejson, Bounds, TileJSON}; -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] pub struct TableSource { /// Table source id pub id: String, diff --git a/src/srv/config.rs b/src/srv/config.rs index 22f96174..63d1f0ca 100644 --- a/src/srv/config.rs +++ b/src/srv/config.rs @@ -17,7 +17,7 @@ pub struct SrvArgs { pub workers: Option, } -#[derive(Clone, Debug, Serialize, PartialEq, Eq)] +#[derive(Clone, Debug, Serialize, PartialEq)] pub struct SrvConfig { pub keep_alive: usize, pub listen_addresses: String,