diff --git a/app/src/cockpit/model_tests.rs b/app/src/cockpit/model_tests.rs index e19b861da80..7032718699c 100644 --- a/app/src/cockpit/model_tests.rs +++ b/app/src/cockpit/model_tests.rs @@ -903,13 +903,19 @@ fn model_refresh_ticks_preserve_active_scan_and_disable_invalidates_it() { let model = app.add_model(|ctx| { CockpitModel::subscribe_to_settings(ctx); CockpitModel { + raw_snapshot: initial_snapshot(), snapshot: initial_snapshot(), refresh_flight: RefreshSingleFlight { generation: 7, running: true, rerun_requested: false, }, + raw_inventory: fold_inventory("laptop", Vec::new(), Vec::new()), inventory: fold_inventory("laptop", Vec::new(), Vec::new()), + seen_turns: SeenTurns::new(Utc::now()), + local_terminal_links: HashMap::new(), + focused_terminals: HashMap::new(), + daemon_route_cache: HashMap::new(), managed_fleet: ManagedFleetInventory::default(), pricing: PricingTable::default(), oauth_cache: OauthCache::default(), diff --git a/app/src/cockpit/panel.rs b/app/src/cockpit/panel.rs index 28fb1eb9ee8..9ea169a2b9a 100644 --- a/app/src/cockpit/panel.rs +++ b/app/src/cockpit/panel.rs @@ -681,7 +681,7 @@ fn project_tree_rows<'a>( if let [only] = sessions.as_slice() { let label = merged_label(project_name, titles[0].as_deref()); if let [agent] = only.agents.as_slice() { - let agent: &'a SessionSnapshot = *agent; + let agent: &'a SessionSnapshot = agent; rows.push(TreeRow { depth: 1, kind: TreeRowKind::SessionLeaf { @@ -701,7 +701,7 @@ fn project_tree_rows<'a>( expanded: project_expanded, count: only.agents.len(), has_waiting: only.needs_me > 0, - focused: !project_expanded && only.agents.iter().any(|agent| is_focused(*agent)), + focused: !project_expanded && only.agents.iter().any(|agent| is_focused(agent)), }, }); if project_expanded { @@ -731,7 +731,7 @@ fn project_tree_rows<'a>( && sessions .iter() .flat_map(|session| session.agents.iter()) - .any(|agent| is_focused(*agent)), + .any(|agent| is_focused(agent)), }, }); if !project_expanded { @@ -744,7 +744,7 @@ fn project_tree_rows<'a>( .as_deref() .map(|title| split_title(title, cuts.next().flatten())); if let [agent] = session.agents.as_slice() { - let agent: &'a SessionSnapshot = *agent; + let agent: &'a SessionSnapshot = agent; rows.push(TreeRow { depth: 2, kind: TreeRowKind::SessionLeaf { @@ -765,7 +765,7 @@ fn project_tree_rows<'a>( expanded, count: session.agents.len(), needs_me: session.needs_me, - focused: !expanded && session.agents.iter().any(|agent| is_focused(*agent)), + focused: !expanded && session.agents.iter().any(|agent| is_focused(agent)), }, }); if expanded { @@ -1623,7 +1623,7 @@ impl CockpitPanel { .projects .iter() .flat_map(|project| project.sessions.iter()) - .any(|agent| is_focused(agent)); + .any(&is_focused); let mut host_row = Container::new(self.render_host_header( host, &ident, @@ -1647,7 +1647,7 @@ impl CockpitPanel { pkey, project_expanded, |key| self.expanded_sessions.get(key).copied().unwrap_or(true), - &is_focused, + is_focused, ); for row in &rows { col = col.with_child(self.render_tree_row( @@ -1993,6 +1993,7 @@ impl Entity for CockpitPanel { /// Sidebar actions (routed back into the view by the action system). #[derive(Clone, Debug)] +#[allow(clippy::enum_variant_names)] pub enum CockpitPanelAction { /// Collapse/expand a connected host root. Absent means expanded. ToggleHost(String), diff --git a/app/src/workspace/view.rs b/app/src/workspace/view.rs index 63fa97a8d25..441d4dfa4f5 100644 --- a/app/src/workspace/view.rs +++ b/app/src/workspace/view.rs @@ -228,13 +228,12 @@ use crate::menu::{ use crate::modal::{Modal, ModalEvent, ModalViewState}; use crate::network::{NetworkStatus, NetworkStatusEvent}; use crate::notebooks::manager::{NotebookManager, NotebookSource}; -use crate::pane_group::pane::sftp_pane::SftpPane; #[cfg(feature = "local_fs")] use crate::pane_group::FilePane; use crate::pane_group::ImagePane; use crate::pane_group::{ - self, AnyPaneContent, CodeDiffPane, CodePane, Direction, NewTerminalOptions, PaneContent, - PanesLayout, TabBarHoverIndex, + self, AnyPaneContent, CodeDiffPane, CodePane, Direction, NewTerminalOptions, PanesLayout, + TabBarHoverIndex, }; use crate::remote_server::manager::RemoteServerManager; #[cfg(feature = "local_fs")]