From fa030a835b087e98820ab8f13e1e3e990c667a0f Mon Sep 17 00:00:00 2001 From: Pirmin Kalberer Date: Sun, 6 Aug 2023 12:39:11 +0200 Subject: [PATCH] Fix clippy warnings --- ogcapi-services/src/routes/processes.rs | 2 +- ogcapi-types/src/edr/parameter_names.rs | 9 ++------- ogcapi-types/src/features/feature.rs | 9 ++------- .../src/features/feature_collection.rs | 9 ++------- ogcapi-types/src/features/query.rs | 9 ++------- ogcapi-types/src/processes/execute.rs | 18 ++++-------------- ogcapi-types/src/tiles/tileset.rs | 9 ++------- ogcapi-types/src/tiles/tms.rs | 9 ++------- 8 files changed, 17 insertions(+), 57 deletions(-) diff --git a/ogcapi-services/src/routes/processes.rs b/ogcapi-services/src/routes/processes.rs index fe4bc12..4045810 100644 --- a/ogcapi-services/src/routes/processes.rs +++ b/ogcapi-services/src/routes/processes.rs @@ -70,7 +70,7 @@ async fn processes( } } - summaries.iter_mut().for_each(|mut p| { + summaries.iter_mut().for_each(|p| { p.links = vec![ Link::new(format!("{}/{}", &url[..Position::AfterPath], p.id), SELF) .mediatype(JSON) diff --git a/ogcapi-types/src/edr/parameter_names.rs b/ogcapi-types/src/edr/parameter_names.rs index e304434..36f8045 100644 --- a/ogcapi-types/src/edr/parameter_names.rs +++ b/ogcapi-types/src/edr/parameter_names.rs @@ -23,17 +23,12 @@ pub struct ParameterNames { pub measurement_type: Option, } -#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)] +#[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone)] pub enum Type { + #[default] Parameter, } -impl Default for Type { - fn default() -> Self { - Type::Parameter - } -} - #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)] #[serde(rename_all = "lowercase")] pub enum DataType { diff --git a/ogcapi-types/src/features/feature.rs b/ogcapi-types/src/features/feature.rs index 8afa052..bf97c75 100644 --- a/ogcapi-types/src/features/feature.rs +++ b/ogcapi-types/src/features/feature.rs @@ -9,17 +9,12 @@ use serde_json::{Map, Value}; use crate::common::Links; -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)] pub enum Type { + #[default] Feature, } -impl Default for Type { - fn default() -> Self { - Type::Feature - } -} - /// Abstraction of real world phenomena (ISO 19101-1:2014) #[serde_with::skip_serializing_none] #[derive(Deserialize, Serialize, Debug, Clone, PartialEq)] diff --git a/ogcapi-types/src/features/feature_collection.rs b/ogcapi-types/src/features/feature_collection.rs index 250f56a..9ca4782 100644 --- a/ogcapi-types/src/features/feature_collection.rs +++ b/ogcapi-types/src/features/feature_collection.rs @@ -5,17 +5,12 @@ use crate::common::Links; use super::Feature; -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] +#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)] pub enum Type { + #[default] FeatureCollection, } -impl Default for Type { - fn default() -> Self { - Type::FeatureCollection - } -} - /// A set of Features from a dataset #[serde_with::skip_serializing_none] #[derive(Serialize, Deserialize, Debug, Default, PartialEq)] diff --git a/ogcapi-types/src/features/query.rs b/ogcapi-types/src/features/query.rs index 7b1992c..9424fcc 100644 --- a/ogcapi-types/src/features/query.rs +++ b/ogcapi-types/src/features/query.rs @@ -34,15 +34,10 @@ pub struct Query { pub additional_parameters: HashMap, } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Default, Debug, Clone)] #[serde(rename_all = "kebab-case")] pub enum FilterLang { + #[default] CqlText, CqlJson, } - -impl std::default::Default for FilterLang { - fn default() -> Self { - FilterLang::CqlText - } -} diff --git a/ogcapi-types/src/processes/execute.rs b/ogcapi-types/src/processes/execute.rs index 5e7302b..2771b48 100644 --- a/ogcapi-types/src/processes/execute.rs +++ b/ogcapi-types/src/processes/execute.rs @@ -87,32 +87,22 @@ pub enum Schema { Object(Map), } -#[derive(Serialize, Deserialize, Debug)] +#[derive(Serialize, Deserialize, Default, Debug)] #[serde(rename_all = "lowercase")] pub enum TransmissionMode { + #[default] Value, Reference, } -impl Default for TransmissionMode { - fn default() -> Self { - TransmissionMode::Value - } -} - -#[derive(Serialize, Deserialize, Debug)] +#[derive(Serialize, Deserialize, Default, Debug)] #[serde(rename_all = "lowercase")] pub enum Response { + #[default] Raw, Document, } -impl Default for Response { - fn default() -> Self { - Response::Raw - } -} - #[derive(Serialize, Deserialize, Debug)] #[serde(rename_all = "camelCase")] pub struct Subscriber { diff --git a/ogcapi-types/src/tiles/tileset.rs b/ogcapi-types/src/tiles/tileset.rs index 331a32b..5d2b09c 100644 --- a/ogcapi-types/src/tiles/tileset.rs +++ b/ogcapi-types/src/tiles/tileset.rs @@ -212,9 +212,10 @@ pub enum GeometryDimension { Solids = 3, } -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, Default)] #[serde(rename_all = "camelCase")] pub enum AccessConstraints { + #[default] Unclassified, Restricted, Confidential, @@ -222,12 +223,6 @@ pub enum AccessConstraints { TopSecret, } -impl Default for AccessConstraints { - fn default() -> Self { - AccessConstraints::Unclassified - } -} - #[cfg(test)] mod test { use super::GeometryDimension; diff --git a/ogcapi-types/src/tiles/tms.rs b/ogcapi-types/src/tiles/tms.rs index ab17f8b..b25f8f9 100644 --- a/ogcapi-types/src/tiles/tms.rs +++ b/ogcapi-types/src/tiles/tms.rs @@ -106,19 +106,14 @@ pub struct VariableMatrixWidth { pub smax_tile_row: u64, } -#[derive(Serialize, Deserialize, Debug, Clone)] +#[derive(Serialize, Deserialize, Default, Debug, Clone)] #[serde(rename_all = "camelCase")] pub enum CornerOfOrigin { + #[default] TopLeft, BottomLeft, } -impl Default for CornerOfOrigin { - fn default() -> Self { - CornerOfOrigin::TopLeft - } -} - #[cfg(test)] mod test { use super::TileMatrixSet;