fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-23 21:58:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix clippy warnings (#3085)

Browse Source 
* Run clippy fix

* Clippy v2

* Make const item static

* Cargo fmt
This commit is contained in:
Dennis Kobert
2025-08-23 11:45:47 +02:00
committed by GitHub
parent c6ec3a27ca
commit 7377871106
47 changed files with 218 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/path-bool/src/parsing/path_data.rs
+11 -11
View File
@@ -45,7 +45,7 @@ pub fn commands_from_path_data(d: &str) -> Result<Vec<PathCommand>, BooleanError
*i += cap[0].len();
&cap[1] == "1"
} else {
panic!("Invalid path data. Expected a flag at index {}", i);
panic!("Invalid path data. Expected a flag at index {i}");
}
};
@@ -128,8 +128,8 @@ pub fn path_to_path_data(path: &Path, eps: f64) -> String {
path_to_commands(path.iter(), eps)
.map(|cmd| match cmd {
PathCommand::Absolute(abs_cmd) => match abs_cmd {
AbsolutePathCommand::H(dx) => format!("H {:.12}", dx),
AbsolutePathCommand::V(dy) => format!("V {:.12}", dy),
AbsolutePathCommand::H(dx) => format!("H {dx:.12}"),
AbsolutePathCommand::V(dy) => format!("V {dy:.12}"),
AbsolutePathCommand::M(p) => format!("M {:.12},{:.12}", p.x, p.y),
AbsolutePathCommand::L(p) => format!("L {:.12},{:.12}", p.x, p.y),
AbsolutePathCommand::C(p1, p2, p3) => format!("C {:.12},{:.12} {:.12},{:.12} {:.12},{:.12}", p1.x, p1.y, p2.x, p2.y, p3.x, p3.y),
@@ -146,18 +146,18 @@ pub fn path_to_path_data(path: &Path, eps: f64) -> String {
AbsolutePathCommand::Z => "Z".to_string(),
},
PathCommand::Relative(rel_cmd) => match rel_cmd {
RelativePathCommand::M(dx, dy) => format!("m {:.12},{:.12}", dx, dy),
RelativePathCommand::L(dx, dy) => format!("l {:.12},{:.12}", dx, dy),
RelativePathCommand::H(dx) => format!("h {:.12}", dx),
RelativePathCommand::V(dy) => format!("v {:.12}", dy),
RelativePathCommand::C(dx1, dy1, dx2, dy2, dx, dy) => format!("c{:.12},{:.12} {:.12},{:.12} {:.12},{:.12}", dx1, dy1, dx2, dy2, dx, dy),
RelativePathCommand::M(dx, dy) => format!("m {dx:.12},{dy:.12}"),
RelativePathCommand::L(dx, dy) => format!("l {dx:.12},{dy:.12}"),
RelativePathCommand::H(dx) => format!("h {dx:.12}"),
RelativePathCommand::V(dy) => format!("v {dy:.12}"),
RelativePathCommand::C(dx1, dy1, dx2, dy2, dx, dy) => format!("c{dx1:.12},{dy1:.12} {dx2:.12},{dy2:.12} {dx:.12},{dy:.12}"),
RelativePathCommand::S(dx2, dy2, dx, dy) => {
format!("s {:.12},{:.12} {:.12},{:.12}", dx2, dy2, dx, dy)
format!("s {dx2:.12},{dy2:.12} {dx:.12},{dy:.12}")
}
RelativePathCommand::Q(dx1, dy1, dx, dy) => {
format!("q {:.12},{:.12} {:.12},{:.12}", dx1, dy1, dx, dy)
format!("q {dx1:.12},{dy1:.12} {dx:.12},{dy:.12}")
}
RelativePathCommand::T(dx, dy) => format!("t{:.12},{:.12}", dx, dy),
RelativePathCommand::T(dx, dy) => format!("t{dx:.12},{dy:.12}"),
RelativePathCommand::A(rx, ry, x_axis_rotation, large_arc_flag, sweep_flag, dx, dy) => {
format!("a {:.12} {:.12} {:.12} {} {} {:.12},{:.12}", rx, ry, x_axis_rotation, large_arc_flag as u8, sweep_flag as u8, dx, dy)
}
libraries/path-bool/src/path_boolean.rs
+3 -1
View File
@@ -551,13 +551,15 @@ fn round_point(point: DVec2) -> I64Vec2 {
(point * ROUNDING_FACTOR).round().as_i64vec2()
}
type Edges = SmallVec<[(PathSegment, u8, MajorEdgeKey, MajorEdgeKey); 2]>;
fn find_vertices(edges: &[MajorGraphEdgeStage1]) -> MajorGraph {
let mut graph = MajorGraph {
edges: SlotMap::with_capacity_and_key(edges.len() * 2),
vertices: SlotMap::with_capacity_and_key(edges.len()),
};
let mut vertex_pair_id_to_edges: HashMap<_, SmallVec<[(PathSegment, u8, MajorEdgeKey, MajorEdgeKey); 2]>> = new_hash_map(edges.len());
let mut vertex_pair_id_to_edges: HashMap<_, Edges> = new_hash_map(edges.len());
let mut vertex_hashmap: HashMap<I64Vec2, MajorVertexKey> = new_hash_map(edges.len() * 2);
for (seg, parent) in edges {