Skip to content

Commit c556c36

Browse files
JosiahParryJosiahParry
committed
cargo clippy fix
1 parent 752734a commit c556c36

9 files changed

+26
-82
lines changed

‎r/src/rust/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use sfg::{
1414
use to::AsEsriGeometry;
1515

1616
pub fn deserialize_sr(sr: &Robj) -> Option<SpatialReference> {
17-
extendr_api::deserializer::from_robj::<SpatialReference>(&sr).map_or(None, |sr| Some(sr))
17+
extendr_api::deserializer::from_robj::<SpatialReference>(sr).ok()
1818
}
1919

2020
#[extendr]

‎r/src/rust/src/to/features/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ pub fn sf_as_features_3d(attrs: List, geoms: List, n: i32, sr: Robj) -> String {
174174

175175
let feats = attrs
176176
.into_iter()
177-
.zip(geoms.into_iter())
177+
.zip(geoms)
178178
.map(|(a, g)| Feature {
179179
geometry: g,
180180
attributes: Some(a),

‎r/src/rust/src/to/featureset.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pub fn as_featureset_2d(attrs: List, geoms: List, n: i32, sr: Robj) -> String {
9797

9898
let feats = attrs
9999
.into_iter()
100-
.zip(geoms.into_iter())
100+
.zip(geoms)
101101
.map(|(a, g)| Feature {
102102
geometry: g,
103103
attributes: Some(a),
@@ -207,7 +207,7 @@ pub fn as_featureset_3d(attrs: List, geoms: List, n: i32, sr: Robj, has_z: bool)
207207

208208
let feats = attrs
209209
.into_iter()
210-
.zip(geoms.into_iter())
210+
.zip(geoms)
211211
.map(|(a, g)| Feature {
212212
geometry: g,
213213
attributes: Some(a),

‎r/src/rust/src/to/linestring.rs

+7-19
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ use serde_esri::{geometry::*, spatial_reference::SpatialReference};
44

55
impl AsEsriGeometry<2> for SfgLineString {
66
fn as_polyline(&self, sr: Option<SpatialReference>) -> Option<EsriPolyline<2>> {
7-
let dim = if let Some(dim) = self.sfg_dim() {
8-
dim
9-
} else {
10-
return None;
11-
};
7+
let dim = self.sfg_dim()?;
128

139
let nrow = self.0.nrows();
1410

@@ -37,7 +33,7 @@ impl AsEsriGeometry<2> for SfgLineString {
3733
spatialReference: sr,
3834
};
3935

40-
return Some(res);
36+
Some(res)
4137
}
4238
_ => None,
4339
}
@@ -46,11 +42,7 @@ impl AsEsriGeometry<2> for SfgLineString {
4642

4743
impl AsEsriGeometry<3> for SfgLineString {
4844
fn as_polyline(&self, sr: Option<SpatialReference>) -> Option<EsriPolyline<3>> {
49-
let dim = if let Some(dim) = self.sfg_dim() {
50-
dim
51-
} else {
52-
return None;
53-
};
45+
let dim = self.sfg_dim()?;
5446

5547
let nrow = self.0.nrows();
5648
let slice = self.0.as_real_slice().unwrap();
@@ -74,7 +66,7 @@ impl AsEsriGeometry<3> for SfgLineString {
7466
spatialReference: sr,
7567
};
7668

77-
return Some(res);
69+
Some(res)
7870
}
7971
SfgDim::XYM => {
8072
let mut points = Vec::with_capacity(nrow);
@@ -94,7 +86,7 @@ impl AsEsriGeometry<3> for SfgLineString {
9486
spatialReference: sr,
9587
};
9688

97-
return Some(res);
89+
Some(res)
9890
}
9991
_ => None,
10092
}
@@ -103,11 +95,7 @@ impl AsEsriGeometry<3> for SfgLineString {
10395

10496
impl AsEsriGeometry<4> for SfgLineString {
10597
fn as_polyline(&self, sr: Option<SpatialReference>) -> Option<EsriPolyline<4>> {
106-
let dim = if let Some(dim) = self.sfg_dim() {
107-
dim
108-
} else {
109-
return None;
110-
};
98+
let dim = self.sfg_dim()?;
11199

112100
let nrow = self.0.nrows();
113101

@@ -137,7 +125,7 @@ impl AsEsriGeometry<4> for SfgLineString {
137125
spatialReference: sr,
138126
};
139127

140-
return Some(res);
128+
Some(res)
141129
}
142130
_ => None,
143131
}

‎r/src/rust/src/to/multilinestring.rs

+3-15
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ use serde_esri::{geometry::*, spatial_reference::SpatialReference};
55

66
impl AsEsriGeometry<2> for SfgMultiLineString {
77
fn as_polyline(&self, sr: Option<SpatialReference>) -> Option<EsriPolyline<2>> {
8-
let dim = if let Some(dim) = self.sfg_dim() {
9-
dim
10-
} else {
11-
return None;
12-
};
8+
let dim = self.sfg_dim()?;
139

1410
let n_elements = self.0.len();
1511

@@ -63,11 +59,7 @@ impl AsEsriGeometry<2> for SfgMultiLineString {
6359

6460
impl AsEsriGeometry<3> for SfgMultiLineString {
6561
fn as_polyline(&self, sr: Option<SpatialReference>) -> Option<EsriPolyline<3>> {
66-
let dim = if let Some(dim) = self.sfg_dim() {
67-
dim
68-
} else {
69-
return None;
70-
};
62+
let dim = self.sfg_dim()?;
7163

7264
let n_elements = self.0.len();
7365

@@ -160,11 +152,7 @@ impl AsEsriGeometry<3> for SfgMultiLineString {
160152

161153
impl AsEsriGeometry<4> for SfgMultiLineString {
162154
fn as_polyline(&self, sr: Option<SpatialReference>) -> Option<EsriPolyline<4>> {
163-
let dim = if let Some(dim) = self.sfg_dim() {
164-
dim
165-
} else {
166-
return None;
167-
};
155+
let dim = self.sfg_dim()?;
168156

169157
let n_elements = self.0.len();
170158

‎r/src/rust/src/to/multipoint.rs

+7-19
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ use serde_esri::{geometry::*, spatial_reference::SpatialReference};
44

55
impl AsEsriGeometry<2> for SfgMultiPoint {
66
fn as_multipoint(&self, sr: Option<SpatialReference>) -> Option<EsriMultiPoint<2>> {
7-
let dim = if let Some(dim) = self.sfg_dim() {
8-
dim
9-
} else {
10-
return None;
11-
};
7+
let dim = self.sfg_dim()?;
128

139
let nrow = self.0.nrows();
1410

@@ -35,22 +31,18 @@ impl AsEsriGeometry<2> for SfgMultiPoint {
3531
spatialReference: sr,
3632
};
3733

38-
return Some(res);
34+
Some(res)
3935
}
40-
SfgDim::XYZ => return None,
41-
SfgDim::XYM => return None,
42-
SfgDim::XYZM => return None,
36+
SfgDim::XYZ => None,
37+
SfgDim::XYM => None,
38+
SfgDim::XYZM => None,
4339
}
4440
}
4541
}
4642

4743
impl AsEsriGeometry<3> for SfgMultiPoint {
4844
fn as_multipoint(&self, sr: Option<SpatialReference>) -> Option<EsriMultiPoint<3>> {
49-
let dim = if let Some(dim) = self.sfg_dim() {
50-
dim
51-
} else {
52-
return None;
53-
};
45+
let dim = self.sfg_dim()?;
5446

5547
let nrow = self.0.nrows();
5648

@@ -103,11 +95,7 @@ impl AsEsriGeometry<3> for SfgMultiPoint {
10395

10496
impl AsEsriGeometry<4> for SfgMultiPoint {
10597
fn as_multipoint(&self, sr: Option<SpatialReference>) -> Option<EsriMultiPoint<4>> {
106-
let dim = if let Some(dim) = self.sfg_dim() {
107-
dim
108-
} else {
109-
return None;
110-
};
98+
let dim = self.sfg_dim()?;
11199

112100
let nrow = self.0.nrows();
113101

‎r/src/rust/src/to/multipolygon.rs

+3-15
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ use serde_esri::{geometry::*, spatial_reference::SpatialReference};
55

66
impl AsEsriGeometry<2> for SfgMultiPolygon {
77
fn as_polygon(&self, sr: Option<SpatialReference>) -> Option<EsriPolygon<2>> {
8-
let dim = if let Some(dim) = self.sfg_dim() {
9-
dim
10-
} else {
11-
return None;
12-
};
8+
let dim = self.sfg_dim()?;
139

1410
let n_elements = self.0.len();
1511

@@ -65,11 +61,7 @@ impl AsEsriGeometry<2> for SfgMultiPolygon {
6561

6662
impl AsEsriGeometry<3> for SfgMultiPolygon {
6763
fn as_polygon(&self, sr: Option<SpatialReference>) -> Option<EsriPolygon<3>> {
68-
let dim = if let Some(dim) = self.sfg_dim() {
69-
dim
70-
} else {
71-
return None;
72-
};
64+
let dim = self.sfg_dim()?;
7365

7466
let n_elements = self.0.len();
7567

@@ -166,11 +158,7 @@ impl AsEsriGeometry<3> for SfgMultiPolygon {
166158

167159
impl AsEsriGeometry<4> for SfgMultiPolygon {
168160
fn as_polygon(&self, sr: Option<SpatialReference>) -> Option<EsriPolygon<4>> {
169-
let dim = if let Some(dim) = self.sfg_dim() {
170-
dim
171-
} else {
172-
return None;
173-
};
161+
let dim = self.sfg_dim()?;
174162

175163
let n_elements = self.0.len();
176164

‎r/src/rust/src/to/point.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ use serde_esri::{geometry::*, spatial_reference::SpatialReference};
44

55
impl SfgPoint {
66
pub fn as_point(&self, sr: Option<SpatialReference>) -> Option<EsriPoint> {
7-
let dim = if let Some(dim) = self.sfg_dim() {
8-
dim
9-
} else {
10-
return None;
11-
};
7+
let dim = self.sfg_dim()?;
128

139
// if it is an empty geometry
1410
if self.0.len() == 0 {

‎r/src/rust/src/to/polygon.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ use serde_esri::{geometry::*, spatial_reference::SpatialReference};
55

66
impl AsEsriGeometry<2> for SfgPolygon {
77
fn as_polygon(&self, sr: Option<SpatialReference>) -> Option<EsriPolygon<2>> {
8-
let dim = if let Some(dim) = self.sfg_dim() {
9-
dim
10-
} else {
11-
return None;
12-
};
8+
let dim = self.sfg_dim()?;
139

1410
let n_elements = self.0.len();
1511

0 commit comments

Comments
 (0)