Skip to content

Commit e49b534

Browse files
committed
allow clippy in vendored spade
1 parent b98d975 commit e49b534

File tree

4 files changed

+3
-138
lines changed

4 files changed

+3
-138
lines changed

src/vendored_spade/delaunay_core/bulk_load.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ where
9191
);
9292
}
9393

94-
if cfg!(any(fuzzing, test)) {
95-
hull_sanity_check(&result, &hull);
96-
}
97-
9894
fix_convexity(&mut result);
9995

10096
for element in skipped_elements {
@@ -252,10 +248,6 @@ where
252248

253249
assert_eq!(edges.len(), 0);
254250

255-
if cfg!(any(fuzzing, test)) {
256-
hull_sanity_check(&result, &hull);
257-
}
258-
259251
Ok(result)
260252
}
261253

@@ -777,10 +769,6 @@ impl Hull {
777769
break;
778770
}
779771

780-
if cfg!(any(fuzzing, test)) {
781-
assert!(!self.empty.contains(&right_index));
782-
}
783-
784772
// Remove current_node - it is completely overlapped by the new segment
785773
self.empty.push(right_index);
786774
self.data[current_node.left].right = current_node.right;

src/vendored_spade/delaunay_core/dcel.rs

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -389,52 +389,4 @@ impl<V, DE, UE, F> Dcel<V, DE, UE, F> {
389389
}
390390
}
391391
}
392-
393-
#[cfg(any(test, fuzzing))]
394-
pub fn sanity_check(&self) {
395-
if self.num_vertices() <= 1 {
396-
assert_eq!(self.num_faces(), 1);
397-
assert_eq!(self.num_undirected_edges(), 0);
398-
assert!(
399-
self.faces[super::dcel_operations::OUTER_FACE_HANDLE.index()]
400-
.adjacent_edge
401-
.is_none()
402-
);
403-
return;
404-
}
405-
406-
for (index, face) in self.faces.iter().enumerate() {
407-
assert_eq!(
408-
self.directed_edge(face.adjacent_edge.unwrap()).face().fix(),
409-
FixedFaceHandle::new(index)
410-
);
411-
}
412-
for (index, vertex) in self.vertices.iter().enumerate() {
413-
assert_eq!(
414-
self.directed_edge(vertex.out_edge.unwrap()).from().fix(),
415-
FixedVertexHandle::new(index)
416-
);
417-
}
418-
419-
for handle in 0..self.edges.len() {
420-
let edge = self.directed_edge(FixedDirectedEdgeHandle::new_normalized(handle));
421-
assert_eq!(edge, edge.next().prev());
422-
assert_eq!(edge, edge.prev().next());
423-
assert_eq!(edge, edge.rev().rev());
424-
if self.num_faces() > 1 {
425-
assert_ne!(edge.face(), edge.rev().face());
426-
}
427-
if !edge.face().is_outer() {
428-
assert_eq!(edge, edge.next().next().next());
429-
assert_eq!(edge, edge.prev().prev().prev());
430-
}
431-
assert_ne!(edge, edge.next());
432-
assert_ne!(edge, edge.prev());
433-
434-
assert_eq!(edge, edge.cw().ccw());
435-
assert_eq!(edge, edge.ccw().cw());
436-
assert_eq!(edge.from(), edge.cw().from());
437-
assert_eq!(edge.from(), edge.ccw().from());
438-
}
439-
}
440392
}

src/vendored_spade/delaunay_core/triangulation_ext.rs

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -736,81 +736,4 @@ pub trait TriangulationExt: Triangulation {
736736
}
737737
}
738738
}
739-
740-
#[cfg(any(test, fuzzing))]
741-
fn basic_sanity_check(&self, check_convexity: bool) {
742-
self.s().sanity_check();
743-
let all_vertices_on_line = self.s().num_faces() <= 1;
744-
745-
for face in self.s().inner_faces() {
746-
let triangle = face.vertices();
747-
// Check that all vertices are stored in ccw orientation
748-
assert!(math::side_query(
749-
triangle[0].position(),
750-
triangle[1].position(),
751-
triangle[2].position()
752-
)
753-
.is_on_left_side(),);
754-
}
755-
756-
for edge in self.s().directed_edges() {
757-
if all_vertices_on_line {
758-
assert_eq!(edge.face().fix(), dcel_operations::OUTER_FACE_HANDLE)
759-
} else {
760-
assert_ne!(edge.face(), edge.rev().face());
761-
}
762-
assert_ne!(edge.from(), edge.to());
763-
}
764-
765-
if all_vertices_on_line {
766-
if self.s().num_vertices() > 1 {
767-
assert_eq!(self.s().num_undirected_edges(), self.s().num_vertices() - 1);
768-
} else {
769-
assert_eq!(self.s().num_undirected_edges(), 0);
770-
}
771-
assert_eq!(self.s().num_faces(), 1);
772-
} else {
773-
let num_inner_edges = self
774-
.s()
775-
.directed_edges()
776-
.filter(|e| !e.face().is_outer())
777-
.count();
778-
779-
let num_inner_faces = self.s().num_faces() - 1;
780-
assert_eq!(num_inner_faces * 3, num_inner_edges);
781-
782-
if check_convexity {
783-
for edge in self.convex_hull() {
784-
for vert in self.vertices() {
785-
assert!(edge
786-
.side_query(vert.position())
787-
.is_on_right_side_or_on_line(),);
788-
}
789-
}
790-
}
791-
}
792-
}
793-
794-
#[cfg(any(test, fuzzing))]
795-
fn sanity_check(&self) {
796-
self.basic_sanity_check(true);
797-
798-
for edge in self.undirected_edges() {
799-
let edge = edge.as_directed();
800-
let rev = edge.rev();
801-
802-
if let (Some(edge_opposite), Some(rev_opposite)) =
803-
(edge.opposite_position(), rev.opposite_position())
804-
{
805-
let from = edge.from().position();
806-
let to = edge.to().position();
807-
assert!(!math::contained_in_circumference(
808-
from,
809-
to,
810-
edge_opposite,
811-
rev_opposite
812-
))
813-
}
814-
}
815-
}
816739
}

src/vendored_spade/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
//! `mint::Point2`. Also implements [HasPosition] for `mint::Point2`.
2222
2323
#![forbid(unsafe_code)]
24-
#![warn(clippy::all)]
24+
#![allow(clippy::all)]
25+
#![allow(unused_imports)]
26+
#![allow(dead_code)]
2527
#![deny(rustdoc::broken_intra_doc_links)]
2628

2729
extern crate alloc;

0 commit comments

Comments
 (0)