Skip to content

Commit 560cf9a

Browse files
committed
style: use formatters
1 parent 0e07a2f commit 560cf9a

21 files changed

Lines changed: 63 additions & 84 deletions

File tree

caracal-tui/src/tui/ui/pages/status/components/information.rs

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crossterm::event::KeyEvent;
2-
use ratatui::{prelude::*, widgets::Paragraph, Frame};
2+
use ratatui::{Frame, prelude::*, widgets::Paragraph};
33
use tokio::sync::mpsc::UnboundedSender;
44

55
use crate::tui::{
@@ -53,19 +53,23 @@ pub struct RenderProps {
5353

5454
impl ComponentRender<RenderProps> for InformationArea {
5555
fn render(&self, frame: &mut Frame<'_>, props: RenderProps) {
56-
let [info_keys_container, info_values_container, keybind_keys_container, keybind_values_container] =
57-
*Layout::default()
58-
.direction(Direction::Horizontal)
59-
.constraints(
60-
[
61-
Constraint::Percentage(10),
62-
Constraint::Percentage(30),
63-
Constraint::Max(10),
64-
Constraint::Percentage(15),
65-
]
66-
.as_ref(),
67-
)
68-
.split(props.area)
56+
let [
57+
info_keys_container,
58+
info_values_container,
59+
keybind_keys_container,
60+
keybind_values_container,
61+
] = *Layout::default()
62+
.direction(Direction::Horizontal)
63+
.constraints(
64+
[
65+
Constraint::Percentage(10),
66+
Constraint::Percentage(30),
67+
Constraint::Max(10),
68+
Constraint::Percentage(15),
69+
]
70+
.as_ref(),
71+
)
72+
.split(props.area)
6973
else {
7074
panic!("The main layout should have 5 chunks")
7175
};

caracal-tui/src/tui/ui/pages/status/components/task_status.rs

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use std::time::SystemTime;
33
use caracal_base::{ext::ProgressChunks, model};
44
use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
55
use ratatui::{
6+
Frame,
67
prelude::*,
78
style::{Modifier, Style},
89
widgets::{Block, Borders, Cell, Row, Table, TableState},
9-
Frame,
1010
};
1111
use tokio::sync::mpsc::UnboundedSender;
1212

@@ -41,13 +41,10 @@ impl TaskStatusList {
4141
return;
4242
}
4343

44-
let i = self.table_state.selected().map_or(0, |i| {
45-
if i >= self.task_statuses().len() - 1 {
46-
0
47-
} else {
48-
i + 1
49-
}
50-
});
44+
let i = self
45+
.table_state
46+
.selected()
47+
.map_or(0, |i| if i >= self.task_statuses().len() - 1 { 0 } else { i + 1 });
5148
self.table_state.select(Some(i));
5249
}
5350

@@ -57,13 +54,10 @@ impl TaskStatusList {
5754
return;
5855
}
5956

60-
let i = self.table_state.selected().map_or(0, |i| {
61-
if i == 0 {
62-
self.task_statuses().len() - 1
63-
} else {
64-
i - 1
65-
}
66-
});
57+
let i = self
58+
.table_state
59+
.selected()
60+
.map_or(0, |i| if i == 0 { self.task_statuses().len() - 1 } else { i - 1 });
6761
self.table_state.select(Some(i));
6862
}
6963

@@ -184,18 +178,10 @@ impl ComponentRender<RenderProps> for TaskStatusList {
184178
let received_bytes = status.chunks.received_bytes();
185179
let total_bytes = {
186180
let v = status.chunks.total_bytes();
187-
if v < received_bytes {
188-
received_bytes
189-
} else {
190-
v
191-
}
181+
if v < received_bytes { received_bytes } else { v }
192182
};
193183
let progress_percentage = if total_bytes == 0 {
194-
if received_bytes == 0 {
195-
String::from("0.00%")
196-
} else {
197-
String::from("100.00%")
198-
}
184+
if received_bytes == 0 { String::from("0.00%") } else { String::from("100.00%") }
199185
} else {
200186
format!("{:.2}%", (received_bytes as f64 / total_bytes as f64) * 100.0)
201187
};

caracal-tui/src/tui/ui/pages/status/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ mod components;
22

33
use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
44
use ratatui::{
5-
layout::{Constraint, Direction, Layout},
65
Frame,
6+
layout::{Constraint, Direction, Layout},
77
};
88
use tokio::sync::mpsc;
99

caracal-tui/src/tui/ui/ui_manager.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ use tokio::sync::mpsc;
88
use tokio_stream::StreamExt;
99

1010
use crate::tui::{
11+
State,
1112
state_store::Action,
1213
ui::{
14+
Error,
1315
components::{Component, ComponentRender},
1416
error,
1517
pages::AppRouter,
16-
Error,
1718
},
18-
State,
1919
};
2020

2121
const RENDERING_TICK_RATE: Duration = Duration::from_millis(250);

caracal/src/cli/ui.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::time::SystemTime;
22

33
use caracal_base::{ext::ProgressChunks, model};
4-
use comfy_table::{presets::UTF8_FULL, Cell, ContentArrangement, Row, Table, TableComponent};
4+
use comfy_table::{Cell, ContentArrangement, Row, Table, TableComponent, presets::UTF8_FULL};
55

66
// SAFETY: the precision loss is acceptable
77
#[allow(clippy::cast_precision_loss)]
@@ -21,18 +21,10 @@ pub fn render_task_statuses_table(task_statuses: &[model::TaskStatus]) -> String
2121
let received_bytes = status.chunks.received_bytes();
2222
let total_bytes = {
2323
let v = status.chunks.total_bytes();
24-
if v < received_bytes {
25-
received_bytes
26-
} else {
27-
v
28-
}
24+
if v < received_bytes { received_bytes } else { v }
2925
};
3026
let progress_percentage = if total_bytes == 0 {
31-
if received_bytes == 0 {
32-
String::from("0.00%")
33-
} else {
34-
String::from("100.00%")
35-
}
27+
if received_bytes == 0 { String::from("0.00%") } else { String::from("100.00%") }
3628
} else {
3729
format!("{:.2}%", (received_bytes as f64 / total_bytes as f64) * 100.0)
3830
};

crates/cli/src/config/log.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use std::{fs::OpenOptions, path::PathBuf};
22

33
use serde::{Deserialize, Serialize};
4-
use serde_with::{serde_as, DisplayFromStr};
4+
use serde_with::{DisplayFromStr, serde_as};
55
use tracing_subscriber::{
6-
layer::SubscriberExt, registry::LookupSpan, util::SubscriberInitExt, Layer,
6+
Layer, layer::SubscriberExt, registry::LookupSpan, util::SubscriberInitExt,
77
};
88

99
#[serde_as]

crates/engine/src/downloader/factory.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ use std::{
22
collections::HashMap,
33
fmt,
44
path::{Path, PathBuf},
5-
sync::{atomic::AtomicBool, Arc},
5+
sync::{Arc, atomic::AtomicBool},
66
time::Duration,
77
};
88

99
use caracal_base::{
1010
model,
1111
profile::{minio::MinioAlias, ssh::SshConfig},
1212
};
13-
use futures::{future, FutureExt};
13+
use futures::{FutureExt, future};
1414
use snafu::{OptionExt, ResultExt};
1515
use tokio::fs::OpenOptions;
1616

1717
pub use crate::error::Error;
1818
use crate::{
19-
downloader::{control_file::ControlFile, Downloader, TransferStatus},
19+
downloader::{Downloader, TransferStatus, control_file::ControlFile},
2020
error,
2121
ext::UriExt,
2222
fetcher::Fetcher,

crates/engine/src/downloader/worker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use snafu::ResultExt;
55
use tokio::{
66
fs::File,
77
io::{AsyncSeekExt, AsyncWriteExt},
8-
sync::{mpsc, oneshot, Mutex},
8+
sync::{Mutex, mpsc, oneshot},
99
};
1010

1111
use crate::{

crates/engine/src/fetcher/fs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::path::{Path, PathBuf};
22

3-
use opendal::{services, Operator};
3+
use opendal::{Operator, services};
44
use snafu::ResultExt;
55

66
use crate::{
77
error,
88
error::{Error, Result},
99
ext::PathExt,
10-
fetcher::{generic::ByteStream, Metadata},
10+
fetcher::{Metadata, generic::ByteStream},
1111
};
1212

1313
#[derive(Clone, Debug)]

crates/engine/src/fetcher/generic.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ impl ByteStream {
2222

2323
let n = self.reader.read_buf(&mut self.buffer).await.context(error::ReadFromReaderSnafu)?;
2424

25-
if n == 0 {
26-
Ok(None)
27-
} else {
28-
Ok(Some(self.buffer.as_ref()))
29-
}
25+
if n == 0 { Ok(None) } else { Ok(Some(self.buffer.as_ref())) }
3026
}
3127

3228
#[inline]

0 commit comments

Comments
 (0)