refactor(term): reduce visibility

crates/synd_term/src/application/direction.rs

@@ -1,14 +1,15 @@
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum Direction {
+pub(crate) enum Direction {
     Up,
     Down,
     Left,
     Right,
 }
 
 #[derive(PartialEq, Eq, Clone, Copy)]
-pub enum IndexOutOfRange {
+pub(crate) enum IndexOutOfRange {
     Wrapping,
+    #[allow(dead_code)]
     Saturating,
 }
 
@@ -18,7 +19,7 @@ impl Direction {
         clippy::cast_possible_truncation,
         clippy::cast_possible_wrap
     )]
-    pub fn apply(&self, index: usize, len: usize, out: IndexOutOfRange) -> usize {
+    pub(crate) fn apply(self, index: usize, len: usize, out: IndexOutOfRange) -> usize {
         if len == 0 {
             return index;
         }

crates/synd_term/src/application/event/mod.rs

@@ -3,7 +3,7 @@ use crate::command::Command;
 mod key_handlers;
 pub use key_handlers::{KeyHandler, KeyHandlers};
 
-pub enum KeyEventResult {
+pub(crate) enum KeyEventResult {
     Consumed(Option<Command>),
     Ignored,
 }

crates/synd_term/src/application/input_parser.rs

@@ -7,9 +7,6 @@ use crate::{
     types::{self},
 };
 
-pub use feed::requirement as parse_requirement;
-
-// type NomError<'s> = nom::error::Error<&'s str>;
 type NomError<'s> = nom::error::VerboseError<&'s str>;
 
 const CTX_REQUIREMENT: &str = "requirement";

crates/synd_term/src/application/mod.rs

@@ -36,20 +36,19 @@ use crate::{
 };
 
 mod direction;
-pub use direction::{Direction, IndexOutOfRange};
+pub(crate) use direction::{Direction, IndexOutOfRange};
 
 mod in_flight;
-pub use in_flight::{InFlight, RequestId, RequestSequence};
+pub(crate) use in_flight::{InFlight, RequestId, RequestSequence};
 
 mod input_parser;
-pub use input_parser::parse_requirement;
 use input_parser::InputParser;
 
 mod authenticator;
 pub use authenticator::{Authenticator, DeviceFlows, JwtService};
 
 mod clock;
-pub use clock::{Clock, SystemClock};
+pub(crate) use clock::{Clock, SystemClock};
 
 mod flags;
 use flags::Should;
@@ -165,10 +164,6 @@ impl Application {
         &self.authenticator.jwt_service
     }
 
-    pub fn jobs_mut(&mut self) -> &mut Jobs {
-        &mut self.jobs
-    }
-
     fn keymaps(&mut self) -> &mut Keymaps {
         self.key_handlers.keymaps_mut().unwrap()
     }
@@ -312,7 +307,7 @@ impl Application {
                     }
                 }
                 Command::MoveAuthenticationProvider(direction) => {
-                    self.components.auth.move_selection(&direction);
+                    self.components.auth.move_selection(direction);
                     self.should_render();
                 }
                 Command::DeviceAuthorizationFlow {
@@ -347,7 +342,7 @@ impl Application {
                     self.keymaps().toggle(KeymapId::Entries);
                     self.keymaps().toggle(KeymapId::Subscription);
 
-                    match self.components.tabs.move_selection(&direction) {
+                    match self.components.tabs.move_selection(direction) {
                         Tab::Feeds if !self.components.subscription.has_subscription() => {
                             next = Some(Command::FetchSubscription {
                                 after: None,
@@ -359,7 +354,7 @@ impl Application {
                     self.should_render();
                 }
                 Command::MoveSubscribedFeed(direction) => {
-                    self.components.subscription.move_selection(&direction);
+                    self.components.subscription.move_selection(direction);
                     self.should_render();
                 }
                 Command::MoveSubscribedFeedFirst => {
@@ -409,10 +404,6 @@ impl Application {
                     self.subscribe_feed(input);
                     self.should_render();
                 }
-                Command::UnsubscribeFeed { url } => {
-                    self.unsubscribe_feed(url);
-                    self.should_render();
-                }
                 Command::FetchSubscription { after, first } => {
                     self.fetch_subscription(Populate::Append, after, first);
                 }
@@ -512,7 +503,7 @@ impl Application {
                     self.should_render();
                 }
                 Command::MoveEntry(direction) => {
-                    self.components.entries.move_selection(&direction);
+                    self.components.entries.move_selection(direction);
                     self.should_render();
                 }
                 Command::MoveEntryFirst => {
@@ -605,9 +596,10 @@ impl Application {
 
     fn handle_terminal_event(&mut self, event: std::io::Result<CrosstermEvent>) -> Option<Command> {
         match event.unwrap() {
-            CrosstermEvent::Resize(columns, rows) => {
-                Some(Command::ResizeTerminal { columns, rows })
-            }
+            CrosstermEvent::Resize(columns, rows) => Some(Command::ResizeTerminal {
+                _columns: columns,
+                _rows: rows,
+            }),
             CrosstermEvent::Key(KeyEvent {
                 kind: KeyEventKind::Release,
                 ..

crates/synd_term/src/command.rs

@@ -13,11 +13,11 @@ use crate::{
 };
 
 #[derive(Debug, Clone)]
-pub enum Command {
+pub(crate) enum Command {
     Quit,
     ResizeTerminal {
-        columns: u16,
-        rows: u16,
+        _columns: u16,
+        _rows: u16,
     },
     RenderThrobber,
     Idle,
@@ -52,9 +52,6 @@ pub enum Command {
     SubscribeFeed {
         input: SubscribeFeedInput,
     },
-    UnsubscribeFeed {
-        url: FeedUrl,
-    },
     CompleteSubscribeFeed {
         feed: Feed,
         request_seq: RequestSequence,

crates/synd_term/src/job.rs

@@ -2,9 +2,9 @@ use futures_util::{future::BoxFuture, stream::FuturesUnordered};
 
 use crate::command::Command;
 
-pub type JobFuture = BoxFuture<'static, anyhow::Result<Command>>;
+pub(crate) type JobFuture = BoxFuture<'static, anyhow::Result<Command>>;
 
-pub struct Jobs {
+pub(crate) struct Jobs {
     pub futures: FuturesUnordered<JobFuture>,
 }
 

crates/synd_term/src/keymap/mod.rs

@@ -10,7 +10,7 @@ pub mod macros;
 use crate::{application::event::KeyEventResult, command::Command};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum KeymapId {
+pub(crate) enum KeymapId {
     Global = 0,
     Login = 1,
     Tabs = 2,
@@ -22,7 +22,8 @@ pub enum KeymapId {
 }
 
 #[derive(Debug)]
-pub struct Keymap {
+pub(crate) struct Keymap {
+    #[allow(dead_code)]
     id: KeymapId,
     enable: bool,
     trie: KeyTrie,
@@ -44,10 +45,6 @@ impl Keymap {
         Self::new(id, KeyTrie::Node(KeyTrieNode { map }))
     }
 
-    pub fn id(&self) -> KeymapId {
-        self.id
-    }
-
     fn search(&mut self, event: &KeyEvent) -> Option<Command> {
         let first = self.pending_keys.first().unwrap_or(event);
         let trie = match self.trie.search(&[*first]) {
@@ -71,7 +68,7 @@ impl Keymap {
     }
 }
 
-pub struct KeymapsConfig {
+pub(crate) struct KeymapsConfig {
     pub login: KeyTrie,
     pub tabs: KeyTrie,
     pub entries: KeyTrie,
@@ -88,7 +85,7 @@ impl Default for KeymapsConfig {
 }
 
 #[derive(Debug)]
-pub struct Keymaps {
+pub(crate) struct Keymaps {
     keymaps: Vec<Keymap>,
 }
 
@@ -148,7 +145,7 @@ impl Default for Keymaps {
 }
 
 #[derive(Clone, Debug)]
-pub enum KeyTrie {
+pub(crate) enum KeyTrie {
     Command(Command),
     Node(KeyTrieNode),
 }

crates/synd_term/src/lib.rs

@@ -2,10 +2,10 @@
 #![warn(rustdoc::broken_intra_doc_links)]
 
 pub mod application;
-pub mod auth;
+pub(crate) mod auth;
 pub mod cli;
 pub mod client;
-pub mod command;
+pub(crate) mod command;
 pub mod config;
 pub mod interact;
 pub mod job;

crates/synd_term/src/ui/components/authentication.rs

@@ -18,13 +18,13 @@ use crate::{
 
 /// Handle user authentication
 #[derive(PartialEq, Eq)]
-pub enum AuthenticateState {
+pub(crate) enum AuthenticateState {
     NotAuthenticated,
     DeviceFlow(DeviceAuthorizationResponse),
     Authenticated,
 }
 
-pub struct Authentication {
+pub(crate) struct Authentication {
     state: AuthenticateState,
     providers: Vec<AuthenticationProvider>,
     selected_provider_index: usize,
@@ -49,7 +49,7 @@ impl Authentication {
         self.providers[self.selected_provider_index]
     }
 
-    pub fn move_selection(&mut self, direction: &Direction) {
+    pub fn move_selection(&mut self, direction: Direction) {
         self.selected_provider_index = direction.apply(
             self.selected_provider_index,
             self.providers.len(),

crates/synd_term/src/ui/components/entries.rs

@@ -22,7 +22,8 @@ use ratatui::{
 };
 use synd_feed::types::FeedUrl;
 
-pub struct Entries {
+#[allow(clippy::struct_field_names)]
+pub(crate) struct Entries {
     selected_entry_index: usize,
     entries: Vec<types::Entry>,
     effective_entries: Vec<usize>,
@@ -76,7 +77,7 @@ impl Entries {
         self.apply_filter();
     }
 
-    pub fn move_selection(&mut self, direction: &Direction) {
+    pub fn move_selection(&mut self, direction: Direction) {
         self.selected_entry_index = direction.apply(
             self.selected_entry_index,
             self.effective_entries.len(),

crates/synd_term/src/ui/components/filter.rs

@@ -35,13 +35,13 @@ static LABELS: &[char] = &[
 ];
 
 #[derive(Clone, Copy, PartialEq, Eq)]
-pub enum FilterResult {
+pub(crate) enum FilterResult {
     Use,
     Discard,
 }
 
 #[derive(Clone)]
-pub struct FeedFilter {
+pub(crate) struct FeedFilter {
     requirement: Requirement,
     categories: HashMap<Category<'static>, FilterCategoryState>,
     matcher: Matcher,
@@ -96,7 +96,7 @@ impl FeedFilter {
 }
 
 #[derive(Debug)]
-pub struct Filter {
+pub(crate) struct Filter {
     state: State,
     requirement: Requirement,
     categories: Vec<Category<'static>>,
@@ -114,7 +114,7 @@ enum State {
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum FilterCategoryState {
+pub(crate) enum FilterCategoryState {
     Active,
     Inactive,
 }

crates/synd_term/src/ui/components/mod.rs

@@ -6,15 +6,15 @@ use crate::{
     },
 };
 
-pub mod authentication;
-pub mod entries;
-pub mod filter;
-pub mod root;
-pub mod status;
-pub mod subscription;
-pub mod tabs;
+pub(crate) mod authentication;
+pub(crate) mod entries;
+pub(crate) mod filter;
+pub(crate) mod root;
+pub(crate) mod status;
+pub(crate) mod subscription;
+pub(crate) mod tabs;
 
-pub struct Components {
+pub(crate) struct Components {
     pub tabs: Tabs,
     pub filter: Filter,
     pub prompt: StatusLine,

crates/synd_term/src/ui/components/subscription.rs

@@ -136,10 +136,10 @@ impl Subscription {
     pub fn remove_unsubscribed_feed(&mut self, url: &FeedUrl) {
         self.feeds.retain(|feed_meta| &feed_meta.url != url);
         self.apply_filter();
-        self.move_selection(&Direction::Up);
+        self.move_selection(Direction::Up);
     }
 
-    pub fn move_selection(&mut self, direction: &Direction) {
+    pub fn move_selection(&mut self, direction: Direction) {
         self.selected_feed_index = direction.apply(
             self.selected_feed_index,
             self.effective_feeds.len(),

crates/synd_term/src/ui/components/tabs.rs

@@ -36,7 +36,7 @@ impl Tabs {
         }
     }
 
-    pub fn move_selection(&mut self, direction: &Direction) -> Tab {
+    pub fn move_selection(&mut self, direction: Direction) -> Tab {
         self.selected = direction.apply(self.selected, self.tabs.len(), IndexOutOfRange::Wrapping);
         self.current()
     }

crates/synd_term/src/ui/widgets/prompt.rs

@@ -16,7 +16,7 @@ enum Move {
 }
 
 #[derive(Debug)]
-pub struct Prompt {
+pub(crate) struct Prompt {
     line: String,
     cursor: usize,
 }
@@ -43,7 +43,7 @@ impl Prompt {
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
-pub enum RenderCursor {
+pub(crate) enum RenderCursor {
     Enable,
     Disable,
 }