Fix clippy warnings

georust · Aug 6, 2023 · fa030a8 · fa030a8
1 parent 9f036f8
commit fa030a8
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 57 deletions.
diff --git 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
@@ -23,17 +23,12 @@ pub struct ParameterNames {
     pub measurement_type: Option<MeasurementType>,
 }
 
-#[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
@@ -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
@@ -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
@@ -34,15 +34,10 @@ pub struct Query {
     pub additional_parameters: HashMap<String, String>,
 }
 
-#[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
@@ -87,32 +87,22 @@ pub enum Schema {
     Object(Map<String, Value>),
 }
 
-#[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
@@ -212,22 +212,17 @@ pub enum GeometryDimension {
     Solids = 3,
 }
 
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Default)]
 #[serde(rename_all = "camelCase")]
 pub enum AccessConstraints {
+    #[default]
     Unclassified,
     Restricted,
     Confidential,
     Secret,
     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
@@ -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;