Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust fmt and clippy after toolchain upgrade

Browse Source
This commit is contained in:
Marcel Märtens
2020-12-10 12:50:48 +01:00
parent b2a814b1d7
commit ccb01e1898
38 changed files with 249 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server-cli/src/logging.rs
View File

@ -56,7 +56,9 @@ pub fn init(basic: bool) {
.with_env_filter(filter);
if basic {
subscriber.with_writer(|| StandardStream::stdout(ColorChoice::Auto)).init();
subscriber
.with_writer(|| StandardStream::stdout(ColorChoice::Auto))
.init();
} else {
subscriber.with_writer(|| LOG.clone()).init();
}

1
server-cli/src/main.rs
View File

@ -25,6 +25,7 @@ use tracing::info;
const TPS: u64 = 30;
#[allow(clippy::unnecessary_wraps)]
fn main() -> io::Result<()> {
let matches = App::new("Veloren server cli")
.version(common::util::DISPLAY_VERSION_LONG.as_str())

14
server-cli/src/tui_runner.rs
View File

@ -204,12 +204,14 @@ impl Tui {
let block = Block::default().borders(Borders::ALL);
let mut wrap = Wrap::default();
wrap.scroll_callback = Some(Box::new(|text_area, lines| {
LOG.resize(text_area.height as usize);
let len = lines.len() as u16;
(len.saturating_sub(text_area.height), 0)
}));
let wrap = Wrap {
scroll_callback: Some(Box::new(|text_area, lines| {
LOG.resize(text_area.height as usize);
let len = lines.len() as u16;
(len.saturating_sub(text_area.height), 0)
})),
..Default::default()
};
let logger = Paragraph::new(LOG.inner.lock().unwrap().clone())
.block(block)