Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Satisfy clippy

Browse source
This commit is contained in:
Joscha 2023-01-05 14:21:50 +01:00
parent 5acf49d018
commit 20186bda5c
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ui/chat/tree/layout.rs
View file

@ -388,6 +388,7 @@ impl<M: Msg + ChatMsg, S: MsgStore<M>> InnerTreeViewState<M, S> {
// message should always be visible. I'm not using top_line.clamp(...) // message should always be visible. I'm not using top_line.clamp(...)
// because the order of the min and max matters. // because the order of the min and max matters.
let top_line = block.top_line; let top_line = block.top_line;
#[allow(clippy::manual_clamp)]
let new_top_line = top_line.min(max_line).max(min_line); let new_top_line = top_line.min(max_line).max(min_line);
if new_top_line != top_line { if new_top_line != top_line {
blocks.blocks_mut().offset(new_top_line - top_line); blocks.blocks_mut().offset(new_top_line - top_line);
@ -415,6 +416,7 @@ impl<M: Msg + ChatMsg, S: MsgStore<M>> InnerTreeViewState<M, S> {
// because the order of the min and max matters. // because the order of the min and max matters.
let top_line = block.top_line; let top_line = block.top_line;
let new_top_line = (height - block.height) / 2; let new_top_line = (height - block.height) / 2;
#[allow(clippy::manual_clamp)]
let new_top_line = new_top_line.min(max_line).max(min_line); let new_top_line = new_top_line.min(max_line).max(min_line);
if new_top_line != top_line { if new_top_line != top_line {
blocks.blocks_mut().offset(new_top_line - top_line); blocks.blocks_mut().offset(new_top_line - top_line);

8
src/ui/rooms.rs
View file

@ -265,13 +265,13 @@ impl Rooms {
match (status, unseen) { match (status, unseen) {
(None, None) => Styled::default(), (None, None) => Styled::default(),
(None, Some(u)) => Styled::new_plain(" (") (None, Some(u)) => Styled::new_plain(" (")
.then(&u, unseen_style) .then(u, unseen_style)
.then_plain(")"), .then_plain(")"),
(Some(s), None) => Styled::new_plain(" (").then_plain(&s).then_plain(")"), (Some(s), None) => Styled::new_plain(" (").then_plain(s).then_plain(")"),
(Some(s), Some(u)) => Styled::new_plain(" (") (Some(s), Some(u)) => Styled::new_plain(" (")
.then_plain(&s) .then_plain(s)
.then_plain(", ") .then_plain(", ")
.then(&u, unseen_style) .then(u, unseen_style)
.then_plain(")"), .then_plain(")"),
} }
} }