Update fmt/clippy for rust 1.83 (#43)

* fmt * clippy
georust · Dec 2, 2024 · b61e7d3 · b61e7d3
1 parent 51a95ff
commit b61e7d3
Show file tree

Hide file tree

Showing 13 changed files with 245 additions and 63 deletions.
diff --git a/src/reader/coord.rs b/src/reader/coord.rs
@@ -80,7 +80,7 @@ impl<'a> Coord<'a> {
     }
 }
 
-impl<'a> CoordTrait for Coord<'a> {
+impl CoordTrait for Coord<'_> {
     type T = f64;
 
     fn dim(&self) -> Dimensions {

diff --git a/src/reader/geometry.rs b/src/reader/geometry.rs
@@ -76,16 +76,46 @@ impl<'a> Wkb<'a> {
 
 impl<'a> GeometryTrait for Wkb<'a> {
     type T = f64;
-    type PointType<'b> = Point<'a> where Self: 'b;
-    type LineStringType<'b> = LineString<'a> where Self: 'b;
-    type PolygonType<'b> = Polygon<'a> where Self: 'b;
-    type MultiPointType<'b> = MultiPoint<'a> where Self: 'b;
-    type MultiLineStringType<'b> = MultiLineString<'a> where Self: 'b;
-    type MultiPolygonType<'b> = MultiPolygon<'a> where Self: 'b;
-    type GeometryCollectionType<'b> = GeometryCollection<'a> where Self: 'b;
-    type RectType<'b> = UnimplementedRect<f64> where Self: 'b;
-    type TriangleType<'b> = UnimplementedTriangle<f64> where Self: 'b;
-    type LineType<'b> = UnimplementedLine<f64> where Self: 'b;
+    type PointType<'b>
+        = Point<'a>
+    where
+        Self: 'b;
+    type LineStringType<'b>
+        = LineString<'a>
+    where
+        Self: 'b;
+    type PolygonType<'b>
+        = Polygon<'a>
+    where
+        Self: 'b;
+    type MultiPointType<'b>
+        = MultiPoint<'a>
+    where
+        Self: 'b;
+    type MultiLineStringType<'b>
+        = MultiLineString<'a>
+    where
+        Self: 'b;
+    type MultiPolygonType<'b>
+        = MultiPolygon<'a>
+    where
+        Self: 'b;
+    type GeometryCollectionType<'b>
+        = GeometryCollection<'a>
+    where
+        Self: 'b;
+    type RectType<'b>
+        = UnimplementedRect<f64>
+    where
+        Self: 'b;
+    type TriangleType<'b>
+        = UnimplementedTriangle<f64>
+    where
+        Self: 'b;
+    type LineType<'b>
+        = UnimplementedLine<f64>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dimension().into()
@@ -122,16 +152,46 @@ impl<'a> GeometryTrait for Wkb<'a> {
 
 impl<'a> GeometryTrait for &'a Wkb<'a> {
     type T = f64;
-    type PointType<'b> = Point<'a> where Self: 'b;
-    type LineStringType<'b> = LineString<'a> where Self: 'b;
-    type PolygonType<'b> = Polygon<'a> where Self: 'b;
-    type MultiPointType<'b> = MultiPoint<'a> where Self: 'b;
-    type MultiLineStringType<'b> = MultiLineString<'a> where Self: 'b;
-    type MultiPolygonType<'b> = MultiPolygon<'a> where Self: 'b;
-    type GeometryCollectionType<'b> = GeometryCollection<'a> where Self: 'b;
-    type RectType<'b> = UnimplementedRect<f64> where Self: 'b;
-    type TriangleType<'b> = UnimplementedTriangle<f64> where Self: 'b;
-    type LineType<'b> = UnimplementedLine<f64> where Self: 'b;
+    type PointType<'b>
+        = Point<'a>
+    where
+        Self: 'b;
+    type LineStringType<'b>
+        = LineString<'a>
+    where
+        Self: 'b;
+    type PolygonType<'b>
+        = Polygon<'a>
+    where
+        Self: 'b;
+    type MultiPointType<'b>
+        = MultiPoint<'a>
+    where
+        Self: 'b;
+    type MultiLineStringType<'b>
+        = MultiLineString<'a>
+    where
+        Self: 'b;
+    type MultiPolygonType<'b>
+        = MultiPolygon<'a>
+    where
+        Self: 'b;
+    type GeometryCollectionType<'b>
+        = GeometryCollection<'a>
+    where
+        Self: 'b;
+    type RectType<'b>
+        = UnimplementedRect<f64>
+    where
+        Self: 'b;
+    type TriangleType<'b>
+        = UnimplementedTriangle<f64>
+    where
+        Self: 'b;
+    type LineType<'b>
+        = UnimplementedLine<f64>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dimension().into()
@@ -172,16 +232,46 @@ macro_rules! impl_specialization {
     ($geometry_type:ident) => {
         impl GeometryTrait for $geometry_type<'_> {
             type T = f64;
-            type PointType<'b> = Point<'b> where Self: 'b;
-            type LineStringType<'b> = LineString<'b> where Self: 'b;
-            type PolygonType<'b> = Polygon<'b> where Self: 'b;
-            type MultiPointType<'b> = MultiPoint<'b> where Self: 'b;
-            type MultiLineStringType<'b> = MultiLineString<'b> where Self: 'b;
-            type MultiPolygonType<'b> = MultiPolygon<'b> where Self: 'b;
-            type GeometryCollectionType<'b> = GeometryCollection<'b> where Self: 'b;
-            type RectType<'b> = geo_traits::UnimplementedRect<f64> where Self: 'b;
-            type LineType<'b> = geo_traits::UnimplementedLine<f64> where Self: 'b;
-            type TriangleType<'b> = geo_traits::UnimplementedTriangle<f64> where Self: 'b;
+            type PointType<'b>
+                = Point<'b>
+            where
+                Self: 'b;
+            type LineStringType<'b>
+                = LineString<'b>
+            where
+                Self: 'b;
+            type PolygonType<'b>
+                = Polygon<'b>
+            where
+                Self: 'b;
+            type MultiPointType<'b>
+                = MultiPoint<'b>
+            where
+                Self: 'b;
+            type MultiLineStringType<'b>
+                = MultiLineString<'b>
+            where
+                Self: 'b;
+            type MultiPolygonType<'b>
+                = MultiPolygon<'b>
+            where
+                Self: 'b;
+            type GeometryCollectionType<'b>
+                = GeometryCollection<'b>
+            where
+                Self: 'b;
+            type RectType<'b>
+                = geo_traits::UnimplementedRect<f64>
+            where
+                Self: 'b;
+            type LineType<'b>
+                = geo_traits::UnimplementedLine<f64>
+            where
+                Self: 'b;
+            type TriangleType<'b>
+                = geo_traits::UnimplementedTriangle<f64>
+            where
+                Self: 'b;
 
             fn dim(&self) -> geo_traits::Dimensions {
                 self.dimension().into()
@@ -208,16 +298,46 @@ macro_rules! impl_specialization {
 
         impl<'a> GeometryTrait for &'a $geometry_type<'_> {
             type T = f64;
-            type PointType<'b> = Point<'b> where Self: 'b;
-            type LineStringType<'b> = LineString<'b> where Self: 'b;
-            type PolygonType<'b> = Polygon<'b> where Self: 'b;
-            type MultiPointType<'b> = MultiPoint<'b> where Self: 'b;
-            type MultiLineStringType<'b> = MultiLineString<'b> where Self: 'b;
-            type MultiPolygonType<'b> = MultiPolygon<'b> where Self: 'b;
-            type GeometryCollectionType<'b> = GeometryCollection<'b> where Self: 'b;
-            type RectType<'b> = geo_traits::UnimplementedRect<f64> where Self: 'b;
-            type LineType<'b> = geo_traits::UnimplementedLine<f64> where Self: 'b;
-            type TriangleType<'b> = geo_traits::UnimplementedTriangle<f64> where Self: 'b;
+            type PointType<'b>
+                = Point<'b>
+            where
+                Self: 'b;
+            type LineStringType<'b>
+                = LineString<'b>
+            where
+                Self: 'b;
+            type PolygonType<'b>
+                = Polygon<'b>
+            where
+                Self: 'b;
+            type MultiPointType<'b>
+                = MultiPoint<'b>
+            where
+                Self: 'b;
+            type MultiLineStringType<'b>
+                = MultiLineString<'b>
+            where
+                Self: 'b;
+            type MultiPolygonType<'b>
+                = MultiPolygon<'b>
+            where
+                Self: 'b;
+            type GeometryCollectionType<'b>
+                = GeometryCollection<'b>
+            where
+                Self: 'b;
+            type RectType<'b>
+                = geo_traits::UnimplementedRect<f64>
+            where
+                Self: 'b;
+            type LineType<'b>
+                = geo_traits::UnimplementedLine<f64>
+            where
+                Self: 'b;
+            type TriangleType<'b>
+                = geo_traits::UnimplementedTriangle<f64>
+            where
+                Self: 'b;
 
             fn dim(&self) -> geo_traits::Dimensions {
                 self.dimension().into()

diff --git a/src/reader/geometry_collection.rs b/src/reader/geometry_collection.rs
@@ -52,9 +52,12 @@ impl<'a> GeometryCollection<'a> {
     }
 }
 
-impl<'a> GeometryCollectionTrait for GeometryCollection<'a> {
+impl GeometryCollectionTrait for GeometryCollection<'_> {
     type T = f64;
-    type GeometryType<'b> = &'b Wkb<'b> where Self: 'b;
+    type GeometryType<'b>
+        = &'b Wkb<'b>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()

diff --git a/src/reader/linearring.rs b/src/reader/linearring.rs
@@ -67,7 +67,10 @@ impl<'a> WKBLinearRing<'a> {
 
 impl<'a> LineStringTrait for WKBLinearRing<'a> {
     type T = f64;
-    type CoordType<'b> = Coord<'a> where Self: 'b;
+    type CoordType<'b>
+        = Coord<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()

diff --git a/src/reader/linestring.rs b/src/reader/linestring.rs
@@ -64,7 +64,10 @@ impl<'a> LineString<'a> {
 
 impl<'a> LineStringTrait for LineString<'a> {
     type T = f64;
-    type CoordType<'b> = Coord<'a> where Self: 'b;
+    type CoordType<'b>
+        = Coord<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()
@@ -86,7 +89,10 @@ impl<'a> LineStringTrait for LineString<'a> {
 
 impl<'a> LineStringTrait for &'a LineString<'a> {
     type T = f64;
-    type CoordType<'b> = Coord<'a> where Self: 'b;
+    type CoordType<'b>
+        = Coord<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()

diff --git a/src/reader/multilinestring.rs b/src/reader/multilinestring.rs
@@ -62,7 +62,10 @@ impl<'a> MultiLineString<'a> {
 
 impl<'a> MultiLineStringTrait for MultiLineString<'a> {
     type T = f64;
-    type LineStringType<'b> = LineString<'a> where Self: 'b;
+    type LineStringType<'b>
+        = LineString<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()
@@ -79,7 +82,10 @@ impl<'a> MultiLineStringTrait for MultiLineString<'a> {
 
 impl<'a> MultiLineStringTrait for &'a MultiLineString<'a> {
     type T = f64;
-    type LineStringType<'b> = LineString<'a> where Self: 'b;
+    type LineStringType<'b>
+        = LineString<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()

diff --git a/src/reader/multipoint.rs b/src/reader/multipoint.rs
@@ -59,7 +59,10 @@ impl<'a> MultiPoint<'a> {
 
 impl<'a> MultiPointTrait for MultiPoint<'a> {
     type T = f64;
-    type PointType<'b> = Point<'a> where Self: 'b;
+    type PointType<'b>
+        = Point<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()
@@ -81,7 +84,10 @@ impl<'a> MultiPointTrait for MultiPoint<'a> {
 
 impl<'a> MultiPointTrait for &'a MultiPoint<'a> {
     type T = f64;
-    type PointType<'b> = Point<'a> where Self: 'b;
+    type PointType<'b>
+        = Point<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()

diff --git a/src/reader/multipolygon.rs b/src/reader/multipolygon.rs
@@ -58,7 +58,10 @@ impl<'a> MultiPolygon<'a> {
 
 impl<'a> MultiPolygonTrait for MultiPolygon<'a> {
     type T = f64;
-    type PolygonType<'b> = Polygon<'a> where Self: 'b;
+    type PolygonType<'b>
+        = Polygon<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()
@@ -75,7 +78,10 @@ impl<'a> MultiPolygonTrait for MultiPolygon<'a> {
 
 impl<'a> MultiPolygonTrait for &'a MultiPolygon<'a> {
     type T = f64;
-    type PolygonType<'b> = Polygon<'a> where Self: 'b;
+    type PolygonType<'b>
+        = Polygon<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()

diff --git a/src/reader/point.rs b/src/reader/point.rs
@@ -56,7 +56,10 @@ impl<'a> Point<'a> {
 
 impl<'a> PointTrait for Point<'a> {
     type T = f64;
-    type CoordType<'b> = Coord<'a> where Self: 'b;
+    type CoordType<'b>
+        = Coord<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()
@@ -73,7 +76,10 @@ impl<'a> PointTrait for Point<'a> {
 
 impl<'a> PointTrait for &Point<'a> {
     type T = f64;
-    type CoordType<'b> = Coord<'a> where Self: 'b;
+    type CoordType<'b>
+        = Coord<'a>
+    where
+        Self: 'b;
 
     fn dim(&self) -> Dimensions {
         self.dim.into()