Skip to content

Commit

Permalink
Remove Eq trait on config (#459)
Browse files Browse the repository at this point in the history
this fails when generating coverage reports
  • Loading branch information
nyurik authored Oct 22, 2022
1 parent 7167594 commit e48cd33
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/pg/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub struct PgArgs {
pub pool_size: Option<u32>,
}

#[derive(Clone, Debug, Serialize, PartialEq, Eq)]
#[derive(Clone, Debug, Serialize, PartialEq)]
pub struct PgConfig {
pub connection_string: String,
pub ca_root_file: Option<String>,
Expand Down
2 changes: 1 addition & 1 deletion src/pg/function_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/pg/table_source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/srv/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub struct SrvArgs {
pub workers: Option<usize>,
}

#[derive(Clone, Debug, Serialize, PartialEq, Eq)]
#[derive(Clone, Debug, Serialize, PartialEq)]
pub struct SrvConfig {
pub keep_alive: usize,
pub listen_addresses: String,
Expand Down

0 comments on commit e48cd33

Please sign in to comment.