From 134e25a4b06f3df7dd61329abb5055562b642ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Wed, 27 Nov 2024 20:59:24 +0200 Subject: [PATCH] Fix Clippy needless_lifetimes --- src/cpl.rs | 2 +- src/gcp.rs | 2 +- src/metadata.rs | 2 +- src/raster/rasterband.rs | 4 ++-- src/vector/feature.rs | 4 ++-- src/vector/layer.rs | 6 +++--- src/vector/options.rs | 2 +- src/vector/sql.rs | 4 ++-- src/vector/transaction.rs | 6 +++--- src/vsi.rs | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/cpl.rs b/src/cpl.rs index e440a854..bff55d5f 100644 --- a/src/cpl.rs +++ b/src/cpl.rs @@ -490,7 +490,7 @@ impl<'a> CslStringListIterator<'a> { } } -impl<'a> Iterator for CslStringListIterator<'a> { +impl Iterator for CslStringListIterator<'_> { type Item = CslStringListEntry; fn next(&mut self) -> Option { diff --git a/src/gcp.rs b/src/gcp.rs index d09b4072..5e7fe48c 100644 --- a/src/gcp.rs +++ b/src/gcp.rs @@ -37,7 +37,7 @@ pub struct GcpRef<'a> { _phantom: PhantomData<&'a gdal_sys::GDAL_GCP>, } -impl<'p> GcpRef<'p> { +impl GcpRef<'_> { /// Returns an unique identifier of the GCP, often numeric. pub fn id(&self) -> String { unsafe { CStr::from_ptr(self.inner.pszId) } diff --git a/src/metadata.rs b/src/metadata.rs index 340cbbee..9882440d 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -290,7 +290,7 @@ impl<'a> MetadataIter<'a> { } } -impl<'a> Iterator for MetadataIter<'a> { +impl Iterator for MetadataIter<'_> { type Item = MetadataEntry; fn next(&mut self) -> Option { diff --git a/src/raster/rasterband.rs b/src/raster/rasterband.rs index ec3abfc7..8e652e58 100644 --- a/src/raster/rasterband.rs +++ b/src/raster/rasterband.rs @@ -1257,13 +1257,13 @@ impl Drop for HistogramCounts { } } -impl<'a> MajorObject for RasterBand<'a> { +impl MajorObject for RasterBand<'_> { fn gdal_object_ptr(&self) -> GDALMajorObjectH { self.c_rasterband } } -impl<'a> Metadata for RasterBand<'a> {} +impl Metadata for RasterBand<'_> {} /// Represents a color interpretation of a RasterBand #[derive(Debug, PartialEq, Eq)] diff --git a/src/vector/feature.rs b/src/vector/feature.rs index 331cb198..1589ac34 100644 --- a/src/vector/feature.rs +++ b/src/vector/feature.rs @@ -614,7 +614,7 @@ impl<'a> FieldValueIterator<'a> { } } -impl<'a> Iterator for FieldValueIterator<'a> { +impl Iterator for FieldValueIterator<'_> { type Item = (String, Option); #[inline] @@ -646,7 +646,7 @@ impl<'a> Iterator for FieldValueIterator<'a> { } } -impl<'a> Drop for Feature<'a> { +impl Drop for Feature<'_> { fn drop(&mut self) { unsafe { gdal_sys::OGR_F_Destroy(self.c_feature); diff --git a/src/vector/layer.rs b/src/vector/layer.rs index 4771e8c9..5e0936b4 100644 --- a/src/vector/layer.rs +++ b/src/vector/layer.rs @@ -107,15 +107,15 @@ pub struct Layer<'a> { phantom: PhantomData<&'a Dataset>, } -impl<'a> MajorObject for Layer<'a> { +impl MajorObject for Layer<'_> { fn gdal_object_ptr(&self) -> GDALMajorObjectH { self.c_layer } } -impl<'a> Metadata for Layer<'a> {} +impl Metadata for Layer<'_> {} -impl<'a> LayerAccess for Layer<'a> { +impl LayerAccess for Layer<'_> { unsafe fn c_layer(&self) -> OGRLayerH { self.c_layer } diff --git a/src/vector/options.rs b/src/vector/options.rs index 35875529..c40f1100 100644 --- a/src/vector/options.rs +++ b/src/vector/options.rs @@ -16,7 +16,7 @@ pub struct LayerOptions<'a> { const EMPTY_LAYER_NAME: &str = ""; -impl<'a> Default for LayerOptions<'a> { +impl Default for LayerOptions<'_> { /// Returns creation options for a new layer with no name, no SRS and unknown geometry type. fn default() -> Self { LayerOptions { diff --git a/src/vector/sql.rs b/src/vector/sql.rs index 01652e10..efc87b9a 100644 --- a/src/vector/sql.rs +++ b/src/vector/sql.rs @@ -25,13 +25,13 @@ impl<'a> Deref for ResultSet<'a> { } } -impl<'a> DerefMut for ResultSet<'a> { +impl DerefMut for ResultSet<'_> { fn deref_mut(&mut self) -> &mut ::Target { &mut self.layer } } -impl<'a> Drop for ResultSet<'a> { +impl Drop for ResultSet<'_> { fn drop(&mut self) { unsafe { gdal_sys::GDALDatasetReleaseResultSet(self.dataset, self.layer.c_layer()) }; } diff --git a/src/vector/transaction.rs b/src/vector/transaction.rs index 720dbcdf..2719e210 100644 --- a/src/vector/transaction.rs +++ b/src/vector/transaction.rs @@ -73,7 +73,7 @@ impl<'a> Transaction<'a> { } } -impl<'a> Deref for Transaction<'a> { +impl Deref for Transaction<'_> { type Target = Dataset; fn deref(&self) -> &Self::Target { @@ -81,13 +81,13 @@ impl<'a> Deref for Transaction<'a> { } } -impl<'a> DerefMut for Transaction<'a> { +impl DerefMut for Transaction<'_> { fn deref_mut(&mut self) -> &mut Self::Target { self.dataset } } -impl<'a> Drop for Transaction<'a> { +impl Drop for Transaction<'_> { fn drop(&mut self) { if self.rollback_on_drop { // We silently swallow any errors, because we have no way to report them from a drop diff --git a/src/vsi.rs b/src/vsi.rs index 77acbeb6..deb057c2 100644 --- a/src/vsi.rs +++ b/src/vsi.rs @@ -85,7 +85,7 @@ impl<'d> MemFileRef<'d> { } } -impl<'d> Drop for MemFileRef<'d> { +impl Drop for MemFileRef<'_> { fn drop(&mut self) { // try to unlink file // if it fails, ignore - it probably was manually unlinked before