From d3858e13506fd1ca96808e9aa49e7ec076330102 Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 12 Oct 2021 11:45:09 +0100 Subject: [PATCH 1/3] Remove .clone() where possible. --- geo/src/algorithm/intersects/polygon.rs | 2 +- geo/src/algorithm/intersects/triangle.rs | 2 +- geo/src/algorithm/relate/geomgraph/geometry_graph.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/geo/src/algorithm/intersects/polygon.rs b/geo/src/algorithm/intersects/polygon.rs index a113d3d36..acb8ab86d 100644 --- a/geo/src/algorithm/intersects/polygon.rs +++ b/geo/src/algorithm/intersects/polygon.rs @@ -40,7 +40,7 @@ where T: GeoNum, { fn intersects(&self, rect: &Rect) -> bool { - self.intersects(&rect.clone().to_polygon()) + self.intersects(&(*rect).to_polygon()) } } symmetric_intersects_impl!(Rect, Polygon); diff --git a/geo/src/algorithm/intersects/triangle.rs b/geo/src/algorithm/intersects/triangle.rs index e2ff6bf7d..c94e9d377 100644 --- a/geo/src/algorithm/intersects/triangle.rs +++ b/geo/src/algorithm/intersects/triangle.rs @@ -7,7 +7,7 @@ where Polygon: Intersects, { fn intersects(&self, rhs: &G) -> bool { - self.clone().to_polygon().intersects(rhs) + (*self).to_polygon().intersects(rhs) } } symmetric_intersects_impl!(Coordinate, Triangle); diff --git a/geo/src/algorithm/relate/geomgraph/geometry_graph.rs b/geo/src/algorithm/relate/geomgraph/geometry_graph.rs index 545b5dc72..a699c06ea 100644 --- a/geo/src/algorithm/relate/geomgraph/geometry_graph.rs +++ b/geo/src/algorithm/relate/geomgraph/geometry_graph.rs @@ -258,7 +258,7 @@ where /// Add a point computed externally. The point is assumed to be a /// Point Geometry part, which has a location of INTERIOR. fn add_point(&mut self, point: &Point) { - self.insert_point(self.arg_index, point.clone().into(), CoordPos::Inside); + self.insert_point(self.arg_index, (*point).into(), CoordPos::Inside); } /// Compute self-nodes, taking advantage of the Geometry type to minimize the number of From 4de4edcb04f062f72068771cf88979ec9d0e6001 Mon Sep 17 00:00:00 2001 From: martin frances Date: Tue, 12 Oct 2021 16:39:29 +0100 Subject: [PATCH 2/3] Update geo/src/algorithm/intersects/polygon.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improved readability. Co-authored-by: Laurențiu Nicola --- geo/src/algorithm/intersects/polygon.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geo/src/algorithm/intersects/polygon.rs b/geo/src/algorithm/intersects/polygon.rs index acb8ab86d..50bb70195 100644 --- a/geo/src/algorithm/intersects/polygon.rs +++ b/geo/src/algorithm/intersects/polygon.rs @@ -40,7 +40,7 @@ where T: GeoNum, { fn intersects(&self, rect: &Rect) -> bool { - self.intersects(&(*rect).to_polygon()) + self.intersects(&rect.to_polygon()) } } symmetric_intersects_impl!(Rect, Polygon); From 7022dd38dd41215bad1f391788692b232a0acbbb Mon Sep 17 00:00:00 2001 From: martin frances Date: Tue, 12 Oct 2021 16:40:29 +0100 Subject: [PATCH 3/3] Update geo/src/algorithm/intersects/triangle.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit simpler to use self.polygon() Co-authored-by: Laurențiu Nicola --- geo/src/algorithm/intersects/triangle.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geo/src/algorithm/intersects/triangle.rs b/geo/src/algorithm/intersects/triangle.rs index c94e9d377..3235ec4bd 100644 --- a/geo/src/algorithm/intersects/triangle.rs +++ b/geo/src/algorithm/intersects/triangle.rs @@ -7,7 +7,7 @@ where Polygon: Intersects, { fn intersects(&self, rhs: &G) -> bool { - (*self).to_polygon().intersects(rhs) + self.to_polygon().intersects(rhs) } } symmetric_intersects_impl!(Coordinate, Triangle);