fix clippy warnings

This commit is contained in:
Takayuki Maeda 2021-09-05 23:40:48 +09:00
parent 1cd7ddf425
commit 4a3d32cf9b
5 changed files with 23 additions and 12 deletions

View File

@ -6,7 +6,7 @@ use crate::{
components::tab::Tab,
components::{
command, ConnectionsComponent, DatabasesComponent, ErrorComponent, HelpComponent,
RecordTableComponent, TabComponent, TableComponent, TableStatusComponent,
RecordTableComponent, TabComponent, TableComponent,
},
config::Config,
};

View File

@ -49,10 +49,6 @@ impl RecordTableComponent {
self.filter.reset();
}
pub fn len(&self) -> usize {
self.table.rows.len()
}
pub fn filter_focused(&self) -> bool {
matches!(self.focus, Focus::Filter)
}

View File

@ -505,7 +505,7 @@ impl DrawableComponent for TableComponent {
} else {
Some(self.headers.len())
},
self.table.as_ref().map_or(None, |t| Some(t.1.clone())),
self.table.as_ref().map(|t| t.1.clone()),
)
.draw(f, chunks[1], focused)?;

View File

@ -74,3 +74,18 @@ const fn calc_scroll_top(
current_top
}
}
#[cfg(test)]
mod tests {
use super::calc_scroll_top;
#[test]
fn test_scroll_no_scroll_to_top() {
assert_eq!(calc_scroll_top(1, 10, 4, 4), 0);
}
#[test]
fn test_scroll_zero_height() {
assert_eq!(calc_scroll_top(4, 0, 4, 3), 0);
}
}

View File

@ -159,15 +159,15 @@ impl Connection {
let user = self
.user
.as_ref()
.ok_or(anyhow::anyhow!("user is not set"))?;
.ok_or_else(|| anyhow::anyhow!("user is not set"))?;
let host = self
.host
.as_ref()
.ok_or(anyhow::anyhow!("host is not set"))?;
.ok_or_else(|| anyhow::anyhow!("host is not set"))?;
let port = self
.port
.as_ref()
.ok_or(anyhow::anyhow!("port is not set"))?;
.ok_or_else(|| anyhow::anyhow!("port is not set"))?;
match self.database.as_ref() {
Some(database) => Ok(format!(
@ -189,15 +189,15 @@ impl Connection {
let user = self
.user
.as_ref()
.ok_or(anyhow::anyhow!("user is not set"))?;
.ok_or_else(|| anyhow::anyhow!("user is not set"))?;
let host = self
.host
.as_ref()
.ok_or(anyhow::anyhow!("host is not set"))?;
.ok_or_else(|| anyhow::anyhow!("host is not set"))?;
let port = self
.port
.as_ref()
.ok_or(anyhow::anyhow!("port is not set"))?;
.ok_or_else(|| anyhow::anyhow!("port is not set"))?;
match self.database.as_ref() {
Some(database) => Ok(format!(