val/ratatrix
1
0
Fork 0
Code Issues 4 Pull Requests Actions Activity

Clippy

Browse Source
This commit is contained in:
Val Lorentz
2023-11-14 22:24:26 +01:00
parent 1ff972803b
commit 2a32db27ea
12 changed files with 47 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app.rs
View File

@ -92,10 +92,7 @@ impl App {
.ok_or_else(|| eyre!("device id in {} is not valid UTF8", device_dir.display()))?;
let client = matrix_sdk::Client::builder()
.server_name(server_name)
.sqlite_store(
&device_dir,
conf.data_passphrase.as_ref().map(|s| s.as_str()),
)
.sqlite_store(&device_dir, conf.data_passphrase.as_deref())
.build()
.await
.with_context(|| format!("Could not initialize client for {}", server_name))?;
@ -296,7 +293,7 @@ impl App {
Action::RunCommand(ref command_line) => {
changes_since_last_render = true;
log::info!("Got command: {command_line}");
crate::commands::run_command(&command_line, &self, &action_tx)?;
crate::commands::run_command(command_line, self, &action_tx)?;
},
_ => {},
}
@ -396,7 +393,6 @@ impl App {
)
.await
.into_iter()
.map(|res| res)
.map(Box::new)
.for_each(|buffer| self.buffers.push(buffer));
}

69
src/buffers/mod.rs
View File

@ -50,7 +50,7 @@ pub struct BufferSortKey {
impl Ord for BufferSortKey {
fn cmp(&self, other: &Self) -> Ordering {
match (self.explicit_order.as_ref(), other.explicit_order.as_ref()) {
(Some(e1), Some(e2)) => e1.cmp(&e2),
(Some(e1), Some(e2)) => e1.cmp(e2),
(Some(_), None) => Ordering::Less, // children without 'order' go to the end
(None, Some(_)) => Ordering::Greater, // ditto
(None, None) => Ordering::Equal,
@ -65,7 +65,7 @@ impl Ord for BufferSortKey {
self.origin_server_ts.as_ref(),
other.origin_server_ts.as_ref(),
) {
(Some(ts1), Some(ts2)) => ts1.cmp(&ts2),
(Some(ts1), Some(ts2)) => ts1.cmp(ts2),
(Some(_), None) => Ordering::Less,
(None, Some(_)) => Ordering::Greater,
(None, None) => Ordering::Equal,
@ -175,6 +175,7 @@ impl Buffers {
}
}
#[allow(clippy::len_without_is_empty)]
pub fn len(&self) -> usize {
self.buffers.len()
}
@ -199,43 +200,33 @@ impl Buffers {
pub fn push(&mut self, new_buffer: Box<dyn Buffer>) {
let new_buffer_id = new_buffer.id();
match new_buffer.children() {
Some(children) => {
for child in children.iter() {
self
.parents
.entry(child.1.clone())
.or_insert_with(HashSet::new)
.insert(new_buffer_id.clone());
}
let all_children = self
.children
.entry(new_buffer_id.clone())
.or_insert_with(SortedVec::new);
// all_children.extend() uses .insert() which always does a bisect search,
// while .push is O(1) when the element is at the end (which is usually what
// happens here).
for child in children.into_vec().into_iter() {
all_children.push(child);
}
},
None => {},
};
if let Some(children) = new_buffer.children() {
for child in children.iter() {
self
.parents
.entry(child.1.clone())
.or_default()
.insert(new_buffer_id.clone());
}
let all_children = self.children.entry(new_buffer_id.clone()).or_default();
// all_children.extend() uses .insert() which always does a bisect search,
// while .push is O(1) when the element is at the end (which is usually what
// happens here).
for child in children.into_vec().into_iter() {
all_children.push(child);
}
}
let parent = match new_buffer.parent() {
Some(parent) => {
self
.parents
.entry(new_buffer_id.clone())
.or_insert_with(HashSet::new)
.or_default()
.insert(parent.clone());
let siblings = self
.children
.entry(parent.clone())
.or_insert_with(SortedVec::new);
if siblings
let siblings = self.children.entry(parent.clone()).or_default();
if !siblings
.iter()
.find(|(_key, buffer_id)| *buffer_id == new_buffer_id)
.is_none()
.any(|(_key, buffer_id)| *buffer_id == new_buffer_id)
{
siblings.push((BufferSortKey::default(), new_buffer_id.clone()));
}
@ -246,10 +237,7 @@ impl Buffers {
.get(&new_buffer_id)
.and_then(|parents| parents.iter().min().cloned()), // .min() for determinism
};
let children = self
.children
.entry(new_buffer_id.clone())
.or_insert_with(SortedVec::new);
let children = self.children.entry(new_buffer_id.clone()).or_default();
match parent.and_then(|parent_id| self.buffers.iter().position(|buf| buf.id() == parent_id)) {
None => self.buffers.push(new_buffer),
@ -264,7 +252,7 @@ impl Buffers {
match self
.parents
.entry(buf.id())
.or_insert_with(HashSet::new)
.or_default()
.iter()
.flat_map(|parent_id| stack.iter().position(|id| *id == *parent_id))
.min() // for determinism
@ -303,10 +291,7 @@ impl Buffers {
let mut child_buffers = Vec::new();
std::mem::swap(&mut all_buffers, &mut self.buffers);
for buf in all_buffers.into_iter() {
if children
.iter()
.find(|(_key, buf_id)| *buf_id == buf.id())
.is_some()
if children.iter().any(|(_key, buf_id)| *buf_id == buf.id())
&& !self.attached_to_parent.contains(&buf.id())
{
self.attached_to_parent.insert(buf.id());
@ -325,7 +310,7 @@ impl Buffers {
.expect("new buffer disappeared")
+ 1,
);
self.buffers.extend(child_buffers.into_iter());
self.buffers.extend(child_buffers);
self.buffers.extend(after_children);
}

8
src/buffers/room.rs
View File

@ -154,10 +154,10 @@ impl SingleClientRoomBuffer {
let sender = event
.sender()
.as_str()
.strip_prefix("@")
.strip_prefix('@')
.expect("missing @ prefix");
match event.content() {
Message(message) => text!(" <{}> {}", sender, message.body().replace("\n", "\n ")),
Message(message) => text!(" <{}> {}", sender, message.body().replace('\n', "\n ")),
RedactedMessage => text!("xx <{}> [redacted]", sender),
Sticker(sticker) => text!("st <{}> {}", sender, sticker.content().body),
UnableToDecrypt(_) => text!("xx <{}> [unable to decrypt]", sender),
@ -213,7 +213,7 @@ impl SingleClientRoomBuffer {
let target = change
.user_id()
.as_str()
.strip_prefix("@")
.strip_prefix('@')
.expect("missing @ prefix");
let Some(change_kind) = change.change() else {
return text!("--- {} made incomprehensible changes to {}", sender, target);
@ -288,7 +288,7 @@ impl SingleClientRoomBuffer {
}
},
TimelineItemKind::Virtual(VirtualTimelineItem::ReadMarker) => {
OwnedBufferItemContent::Divider(format!("read marker"))
OwnedBufferItemContent::Divider("read marker".to_string())
},
TimelineItemKind::Virtual(VirtualTimelineItem::DayDivider(day_divider)) => {
match day_divider.to_system_time() {

5
src/commands/mod.rs
View File

@ -34,6 +34,7 @@ pub trait RataCommand {
pub struct RataCommands(pub HashMap<String, Box<dyn RataCommand>>);
impl RataCommands {
#[allow(clippy::new_without_default)]
pub fn new() -> RataCommands {
RataCommands(HashMap::new())
}
@ -65,11 +66,11 @@ pub fn run_command(
app: &crate::App,
action_tx: &mpsc::UnboundedSender<Action>,
) -> Result<()> {
if command_line.bytes().nth(0) != Some(b'/') {
if command_line.as_bytes().first().copied() != Some(b'/') {
bail!("Not a command: {}", command_line);
}
let (command_name, args) = match command_line[1..].split_once(" ") {
let (command_name, args) = match command_line[1..].split_once(' ') {
Some((command_name, args)) => (command_name, args),
None => (&command_line[1..], ""),
};

4
src/components/backlog.rs
View File

@ -227,7 +227,7 @@ impl Backlog {
x: 0,
y: 0,
width: drawn_width,
height: height,
height,
},
);
*prerender = Some(PrerenderInner {
@ -285,7 +285,7 @@ fn copy_buffer(src: &Buffer, src_area: Rect, dst: &mut Buffer, dst_area: Rect) {
.enumerate()
{
for (x, cell) in line
.into_iter()
.iter()
.skip(src_area.x as usize)
.take(src_area.width as usize)
.enumerate()

4
src/components/buflist.rs
View File

@ -50,10 +50,6 @@ impl Component for Buflist {
}
fn update(&mut self, action: &Action) -> Result<Option<Action>> {
match action {
Action::Tick => {},
_ => {},
}
Ok(None)
}

4
src/components/home.rs
View File

@ -111,10 +111,6 @@ impl Component for Home {
fn update(&mut self, action: &Action) -> Result<Option<Action>> {
self.buflist.update(action)?;
match action {
Action::Tick => {},
_ => {},
}
Ok(None)
}

6
src/config.rs
View File

@ -34,7 +34,7 @@ pub struct AccountConfig {
fn default_device_name() -> String {
match hostname::get() {
Ok(hostname) => format!("ratatrix on {}", hostname.to_string_lossy()),
Err(_) => format!("ratatrix"),
Err(_) => "ratatrix".to_string(),
}
}
@ -79,7 +79,7 @@ impl Config {
log::error!("No configuration file found. Application may not behave as expected");
}
Ok(builder.build()?.try_deserialize()?)
builder.build()?.try_deserialize()
}
}
@ -210,7 +210,7 @@ pub fn key_event_to_string(key_event: &KeyEvent) -> String {
char = format!("f({c})");
&char
},
KeyCode::Char(c) if c == ' ' => "space",
KeyCode::Char(' ') => "space",
KeyCode::Char(c) => {
char = c.to_string();
&char

1
src/plugins/core.rs
View File

@ -74,6 +74,7 @@ struct ActionCommand {
}
impl ActionCommand {
#[allow(clippy::new_ret_no_self)]
pub fn new(name: &'static str, help: &'static str, action: Action) -> Box<dyn RataCommand> {
Box::new(ActionCommand { name, help, action })
}

4
src/utils.rs
View File

@ -160,7 +160,9 @@ pub fn sum_memory_bounds(
match item {
(min, Some(max)) => {
total_min += min;
total_max.as_mut().map(|total_max| *total_max += max);
if let Some(total_max) = total_max.as_mut() {
*total_max += max
}
},
(min, None) => {
total_min += min;

2
src/widgets/bottom_aligned_paragraph.rs
View File

@ -100,7 +100,7 @@ impl<'a> OverlappableWidget for BottomAlignedParagraph<'a> {
let mut max_width = 0;
for (y, line) in lines.into_iter().enumerate() {
for (y, line) in lines.iter().enumerate() {
let mut x = 0;
for StyledGrapheme { symbol, style } in line {
let width = symbol.width();

1
src/widgets/prerender.rs
View File

@ -35,6 +35,7 @@ pub(crate) enum PrerenderValue {
pub struct Prerender(pub(crate) Arc<Mutex<Option<PrerenderInner>>>);
impl Prerender {
#[allow(clippy::new_without_default)]
pub fn new() -> Prerender {
Prerender(Arc::new(Mutex::new(None)))
}