berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: fix some more clippy warnings

This commit is contained in:
Ellen Emilia Anna Zscheile 2025-03-31 01:58:34 +02:00
parent 822bba8fde
commit bf1addbdaf
4 changed files with 29 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/specctra-core/fuzz/fuzz_targets/fuzz_target_2.rs
View File

@ -19,7 +19,7 @@ fuzz_target!(|data: &str| {
let mut dat = Vec::new(); let mut dat = Vec::new();
{ {
let mut lw = ListWriter::new(&mut dat); let mut lw = ListWriter::new(&mut dat);
let _ = lw.write_value(&val).unwrap(); lw.write_value(&val).unwrap();
} }
let cursor = std::io::Cursor::new(dat); let cursor = std::io::Cursor::new(dat);

2
crates/topola-egui/src/action.rs
View File

@ -39,7 +39,7 @@ impl Action {
shortcut.format(&egui::ModifierNames::NAMES, false) shortcut.format(&egui::ModifierNames::NAMES, false)
) )
} else { } else {
format!("{}", self.name) self.name.clone()
} }
} }

2
crates/topola-egui/src/config.rs
View File

@ -34,7 +34,7 @@ pub struct LayerColors {
impl LayerColors { impl LayerColors {
pub fn color(&self, layername: Option<&str>) -> &LayerColor { pub fn color(&self, layername: Option<&str>) -> &LayerColor {
layername layername
.and_then(|layername| Some(self.colors.get(layername).unwrap_or(&self.default))) .map(|layername| self.colors.get(layername).unwrap_or(&self.default))
.unwrap_or(&self.default) .unwrap_or(&self.default)
} }
} }

67
crates/topola-egui/src/viewport.rs
View File

@ -232,26 +232,18 @@ impl Viewport {
} }
} }
let stroke = let stroke = 'blk: {
'blk: { if let Some(navcord) = activity.maybe_navcord() {
if let (Some(source_pos), Some(target_pos)) = ( if let (Some(source_pos), Some(target_pos)) =
activity (
.maybe_navcord() navcord.path.iter().position(|node| {
.map(|navcord| { *node == edge.source()
navcord.path.iter().position(|node| { }),
*node == edge.source() navcord.path.iter().position(|node| {
}) *node == edge.target()
}) }),
.flatten(), )
activity {
.maybe_navcord()
.map(|navcord| {
navcord.path.iter().position(|node| {
*node == edge.target()
})
})
.flatten(),
) {
if target_pos == source_pos + 1 if target_pos == source_pos + 1
|| source_pos == target_pos + 1 || source_pos == target_pos + 1
{ {
@ -261,12 +253,13 @@ impl Viewport {
); );
} }
} }
}
egui::Stroke::new( egui::Stroke::new(
1.0, 1.0,
egui::Color32::from_rgb(125, 125, 125), egui::Color32::from_rgb(125, 125, 125),
) )
}; };
painter.paint_edge(from, to, stroke); painter.paint_edge(from, to, stroke);
} }
@ -284,13 +277,6 @@ impl Viewport {
let resolve_primal = |p: &topola::layout::NodeIndex| { let resolve_primal = |p: &topola::layout::NodeIndex| {
board.layout().node_shape(*p).center() board.layout().node_shape(*p).center()
}; };
let root_bbox3d =
board.layout().drawing().rtree().root().envelope();
let root_bbox = AABB::<[f64; 2]>::from_corners(
[root_bbox3d.lower()[0], root_bbox3d.lower()[1]].into(),
[root_bbox3d.upper()[0], root_bbox3d.upper()[1]].into(),
);
for (nidx, node) in &*navmesh.nodes { for (nidx, node) in &*navmesh.nodes {
if let NavmeshIndex::Dual(didx) = nidx { if let NavmeshIndex::Dual(didx) = nidx {
@ -302,7 +288,7 @@ impl Viewport {
} }
for (eidx, edge) in &*navmesh.edges { for (eidx, edge) in &*navmesh.edges {
// TODO: display edge contents, too // TODO: display edge contents, too
let (a, b) = eidx.clone().into(); let (a, b) = (*eidx).into();
let mut got_primal = false; let mut got_primal = false;
let a_pos = match a { let a_pos = match a {
NavmeshIndex::Primal(p) => { NavmeshIndex::Primal(p) => {
@ -311,7 +297,7 @@ impl Viewport {
} }
NavmeshIndex::Dual(d) => match map.get(&d) { NavmeshIndex::Dual(d) => match map.get(&d) {
None => continue, None => continue,
Some(x) => x.clone(), Some(&x) => x,
}, },
}; };
let b_pos = match b { let b_pos = match b {
@ -321,7 +307,7 @@ impl Viewport {
} }
NavmeshIndex::Dual(d) => match map.get(&d) { NavmeshIndex::Dual(d) => match map.get(&d) {
None => continue, None => continue,
Some(x) => x.clone(), Some(&x) => x,
}, },
}; };
let edge_len = navmesh.edge_paths[edge.1].len(); let edge_len = navmesh.edge_paths[edge.1].len();
@ -348,10 +334,9 @@ impl Viewport {
if menu_bar.show_bboxes { if menu_bar.show_bboxes {
let root_bbox3d = board.layout().drawing().rtree().root().envelope(); let root_bbox3d = board.layout().drawing().rtree().root().envelope();
let root_bbox = AABB::<[f64; 2]>::from_corners( let root_bbox = AABB::<[f64; 2]>::from_corners(
[root_bbox3d.lower()[0], root_bbox3d.lower()[1]].into(), [root_bbox3d.lower()[0], root_bbox3d.lower()[1]],
[root_bbox3d.upper()[0], root_bbox3d.upper()[1]].into(), [root_bbox3d.upper()[0], root_bbox3d.upper()[1]],
); );
painter.paint_bbox(root_bbox); painter.paint_bbox(root_bbox);
} }
@ -359,7 +344,7 @@ impl Viewport {
if let Some(activity) = workspace.interactor.maybe_activity() { if let Some(activity) = workspace.interactor.maybe_activity() {
for ghost in activity.ghosts().iter() { for ghost in activity.ghosts().iter() {
painter painter
.paint_primitive(&ghost, egui::Color32::from_rgb(75, 75, 150)); .paint_primitive(ghost, egui::Color32::from_rgb(75, 75, 150));
} }
if let Some(navmesh) = activity.maybe_navmesh() { if let Some(navmesh) = activity.maybe_navmesh() {
@ -420,8 +405,8 @@ impl Viewport {
}; };
self.transform.translation = egui::Vec2::new( self.transform.translation = egui::Vec2::new(
viewport_rect.center()[0] as f32, viewport_rect.center()[0],
viewport_rect.center()[1] as f32, viewport_rect.center()[1],
) - (self.transform.scaling ) - (self.transform.scaling
* egui::Pos2::new( * egui::Pos2::new(
root_bbox.center()[0] as f32, root_bbox.center()[0] as f32,