From e1d875ae72479069e9f98a7a89737ca74f30d080 Mon Sep 17 00:00:00 2001 From: Ellen Emilia Anna Zscheile Date: Mon, 10 Feb 2025 11:25:55 +0100 Subject: [PATCH] chore: fix most warnings --- crates/topola-egui/src/action.rs | 4 ---- crates/topola-egui/src/actions.rs | 2 +- crates/topola-egui/src/menu_bar.rs | 4 ++-- crates/topola-egui/src/overlay.rs | 18 ++++-------------- crates/topola-egui/src/painter.rs | 4 ++-- crates/topola-egui/src/status_bar.rs | 2 +- crates/topola-egui/src/viewport.rs | 2 +- examples/specctra.rs | 4 ++-- src/autorouter/pointroute.rs | 2 -- src/drawing/drawing.rs | 1 - src/drawing/primitive.rs | 4 ---- src/interactor/interaction.rs | 4 ++-- src/interactor/interactor.rs | 2 +- src/math/tangents.rs | 3 +-- src/router/navcord.rs | 1 - tests/common/mod.rs | 5 ++--- tests/single_layer.rs | 5 +++-- 17 files changed, 22 insertions(+), 45 deletions(-) diff --git a/crates/topola-egui/src/action.rs b/crates/topola-egui/src/action.rs index fb013d5..e795d16 100644 --- a/crates/topola-egui/src/action.rs +++ b/crates/topola-egui/src/action.rs @@ -78,10 +78,6 @@ impl Trigger { } } } - - fn triggered(&self) -> bool { - self.triggered - } } impl Switch { diff --git a/crates/topola-egui/src/actions.rs b/crates/topola-egui/src/actions.rs index 22bcdc4..3b01152 100644 --- a/crates/topola-egui/src/actions.rs +++ b/crates/topola-egui/src/actions.rs @@ -183,7 +183,7 @@ impl ViewActions { pub fn render_menu( &mut self, - ctx: &Context, + _ctx: &Context, ui: &mut Ui, tr: &Translator, menu_bar: &mut MenuBar, diff --git a/crates/topola-egui/src/menu_bar.rs b/crates/topola-egui/src/menu_bar.rs index bf20bab..05c62c7 100644 --- a/crates/topola-egui/src/menu_bar.rs +++ b/crates/topola-egui/src/menu_bar.rs @@ -294,13 +294,13 @@ impl MenuBar { .inner } - pub fn update_preferences_menu(ctx: &egui::Context, ui: &mut egui::Ui, tr: &mut Translator) { + pub fn update_preferences_menu(_ctx: &egui::Context, ui: &mut egui::Ui, tr: &mut Translator) { ui.menu_button(tr.text("tr-menu-preferences"), |ui| { ui.menu_button(tr.text("tr-menu-preferences-set-language"), |ui| { use icu_experimental::displaynames::{ DisplayNamesOptions, Fallback, LocaleDisplayNamesFormatter, }; - use icu_locale_core::{locale, LanguageIdentifier, Locale}; + use icu_locale_core::Locale; let mut display_names_options: DisplayNamesOptions = Default::default(); display_names_options.fallback = Fallback::None; diff --git a/crates/topola-egui/src/overlay.rs b/crates/topola-egui/src/overlay.rs index 3cc7e63..e8b4b62 100644 --- a/crates/topola-egui/src/overlay.rs +++ b/crates/topola-egui/src/overlay.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT use geo::Point; -use rstar::{Point as _, AABB}; +use rstar::AABB; use spade::InsertionError; use topola::{ @@ -12,17 +12,7 @@ use topola::{ selection::{BboxSelectionKind, Selection}, }, board::{AccessMesadata, Board}, - drawing::{ - graph::{GetLayer, MakePrimitive}, - primitive::MakePrimitiveShape, - }, - geometry::shape::{AccessShape, Shape}, - graph::{GenericIndex, GetPetgraphIndex}, - layout::{ - poly::{MakePolygon, PolyWeight}, - via::ViaWeight, - CompoundWeight, Layout, NodeIndex, - }, + geometry::shape::AccessShape, }; use crate::appearance_panel::AppearancePanel; @@ -75,8 +65,8 @@ impl Overlay { pub fn drag_start( &mut self, - board: &Board, - appearance_panel: &AppearancePanel, + _board: &Board, + _appearance_panel: &AppearancePanel, at: Point, modifiers: &egui::Modifiers, ) { diff --git a/crates/topola-egui/src/painter.rs b/crates/topola-egui/src/painter.rs index ece073d..da14c50 100644 --- a/crates/topola-egui/src/painter.rs +++ b/crates/topola-egui/src/painter.rs @@ -6,7 +6,7 @@ use geo::{CoordsIter, Point, Polygon}; use rstar::AABB; use topola::{ geometry::{ - primitive::{AccessPrimitiveShape, PrimitiveShape}, + primitive::PrimitiveShape, shape::AccessShape, }, math::Circle, @@ -72,7 +72,7 @@ impl<'a> Painter<'a> { }; self.ui.painter().add(egui::Shape::rect_stroke( self.transform * rect, - egui::Rounding::ZERO, + egui::CornerRadius::ZERO, egui::Stroke::new(1.0, color), egui::StrokeKind::Inside, )); diff --git a/crates/topola-egui/src/status_bar.rs b/crates/topola-egui/src/status_bar.rs index 4843068..e9eac3f 100644 --- a/crates/topola-egui/src/status_bar.rs +++ b/crates/topola-egui/src/status_bar.rs @@ -18,7 +18,7 @@ impl StatusBar { pub fn update( &mut self, ctx: &egui::Context, - tr: &Translator, + _tr: &Translator, viewport: &Viewport, maybe_activity: Option<&ActivityStepperWithStatus>, ) { diff --git a/crates/topola-egui/src/viewport.rs b/crates/topola-egui/src/viewport.rs index fa8f4f7..6917c19 100644 --- a/crates/topola-egui/src/viewport.rs +++ b/crates/topola-egui/src/viewport.rs @@ -11,7 +11,7 @@ use rstar::{Envelope, AABB}; use topola::{ autorouter::{ execution::Command, - invoker::{GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles, Invoker}, + invoker::{GetGhosts, GetMaybeNavcord, GetMaybeNavmesh, GetObstacles}, }, board::AccessMesadata, drawing::{ diff --git a/examples/specctra.rs b/examples/specctra.rs index 75d9e8b..5655baa 100644 --- a/examples/specctra.rs +++ b/examples/specctra.rs @@ -19,8 +19,8 @@ fn main() -> Result<(), std::io::Error> { let invoker = Invoker::new(Autorouter::new(board).unwrap()); let mut file = File::create("example.ses").unwrap(); - design.write_ses(invoker.autorouter().board(), &mut file); + design.write_ses(invoker.autorouter().board(), &mut file).unwrap(); - let filename = design.get_name(); + //let filename = design.get_name(); Ok(()) } diff --git a/src/autorouter/pointroute.rs b/src/autorouter/pointroute.rs index c4fa96f..082979e 100644 --- a/src/autorouter/pointroute.rs +++ b/src/autorouter/pointroute.rs @@ -21,7 +21,6 @@ use crate::{ use super::{Autorouter, AutorouterError, AutorouterOptions}; pub struct PointrouteExecutionStepper { - point: Point, route: RouteStepper, options: AutorouterOptions, } @@ -49,7 +48,6 @@ impl PointrouteExecutionStepper { let mut router = Router::new(autorouter.board.layout_mut(), options.router_options); Ok(Self { - point, route: router.route( LayoutEdit::new(), origin, diff --git a/src/drawing/drawing.rs b/src/drawing/drawing.rs index 7cf45ab..baffa77 100644 --- a/src/drawing/drawing.rs +++ b/src/drawing/drawing.rs @@ -4,7 +4,6 @@ use contracts_try::{debug_ensures, debug_invariant}; use derive_getters::Getters; -use enum_dispatch::enum_dispatch; use geo::Point; use core::fmt; diff --git a/src/drawing/primitive.rs b/src/drawing/primitive.rs index 2170ee0..2ac5200 100644 --- a/src/drawing/primitive.rs +++ b/src/drawing/primitive.rs @@ -209,10 +209,6 @@ impl<'a, W, CW: Copy, R: AccessRules> GenericPrimitive<'a, W, CW, R> { unreachable!() } } - - fn primitive(&self, index: GenericIndex) -> GenericPrimitive { - GenericPrimitive::new(index, self.drawing) - } } impl<'a, W, CW: Copy, R: AccessRules> GetInterior diff --git a/src/interactor/interaction.rs b/src/interactor/interaction.rs index e6866f5..d404f6b 100644 --- a/src/interactor/interaction.rs +++ b/src/interactor/interaction.rs @@ -35,14 +35,14 @@ impl<'a, M: AccessMesadata> Step, String> for Interaction fn step( &mut self, - context: &mut ActivityContext, + _context: &mut ActivityContext, ) -> Result, InteractionError> { Ok(ControlFlow::Break(String::from(""))) } } impl<'a, M: AccessMesadata> Abort> for InteractionStepper { - fn abort(&mut self, context: &mut ActivityContext) { + fn abort(&mut self, _context: &mut ActivityContext) { todo!(); } } diff --git a/src/interactor/interactor.rs b/src/interactor/interactor.rs index 59d2b71..2ca331a 100644 --- a/src/interactor/interactor.rs +++ b/src/interactor/interactor.rs @@ -87,7 +87,7 @@ impl Interactor { invoker: &mut self.invoker, }) { Ok(ControlFlow::Continue(())) => ControlFlow::Continue(()), - Ok(ControlFlow::Break(msg)) => ControlFlow::Break(Ok(())), + Ok(ControlFlow::Break(_msg)) => ControlFlow::Break(Ok(())), Err(err) => { self.activity = None; ControlFlow::Break(Err(err)) diff --git a/src/math/tangents.rs b/src/math/tangents.rs index b36ed2b..16e8d37 100644 --- a/src/math/tangents.rs +++ b/src/math/tangents.rs @@ -2,8 +2,7 @@ // // SPDX-License-Identifier: MIT -use geo::algorithm::line_measures::{Distance, Euclidean}; -use geo::{geometry::Point, point, Line}; +use geo::{geometry::Point, Line}; use specctra_core::math::Circle; use thiserror::Error; diff --git a/src/router/navcord.rs b/src/router/navcord.rs index daecc5e..93188ae 100644 --- a/src/router/navcord.rs +++ b/src/router/navcord.rs @@ -9,7 +9,6 @@ use crate::{ drawing::{ bend::LooseBendIndex, dot::FixedDotIndex, - graph::PrimitiveIndex, head::{BareHead, CaneHead, Head}, rules::AccessRules, }, diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 04781b0..e342507 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -13,7 +13,6 @@ use topola::{ }, board::{AccessMesadata, Board}, drawing::{ - dot::FixedDotIndex, graph::{GetLayer, GetMaybeNet}, }, geometry::{shape::MeasureLength, GenericNode}, @@ -178,8 +177,8 @@ pub fn assert_single_layer_groundless_autoroute( if let Some(netname) = autorouter.board().layout().rules().net_netname(net) { // We don't route ground. - let mut org = unionfind.find(origin_dot.petgraph_index()); - let mut desc = unionfind.find(destination_dot.petgraph_index()); + let org = unionfind.find(origin_dot.petgraph_index()); + let desc = unionfind.find(destination_dot.petgraph_index()); if netname != "GND" { assert_eq!(org, desc); diff --git a/tests/single_layer.rs b/tests/single_layer.rs index 3c3eccd..a9b97ef 100644 --- a/tests/single_layer.rs +++ b/tests/single_layer.rs @@ -87,6 +87,7 @@ fn test_4x_3rd_order_smd_lc_filters() { // FIXME: This test fails indeterministically. // NOTE: Disabled until determinism is fixed. //#[test] +#[allow(unused)] fn test_tht_3pin_xlr_to_tht_3pin_xlr() { let mut autorouter = common::load_design( "tests/single_layer/tht_3pin_xlr_to_tht_3pin_xlr/tht_3pin_xlr_to_tht_3pin_xlr.dsn", @@ -106,8 +107,8 @@ fn test_tht_3pin_xlr_to_tht_3pin_xlr() { #[test] fn test_smd_non_rectangular_buck_converter() { - let mut path = "tests/single_layer/smd_non_rectangular_buck_converter/smd_non_rectangular_buck_converter.dsn"; - let mut autorouter = common::load_design(&path); + let path = "tests/single_layer/smd_non_rectangular_buck_converter/smd_non_rectangular_buck_converter.dsn"; + let autorouter = common::load_design(&path); let mut invoker = common::create_invoker_and_assert(autorouter);