pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

!fixup cargo fmt

Browse source
This commit is contained in:
a-kenji 2021-07-23 17:25:05 +02:00
parent 485339c584
commit f323880fb7
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zellij-server/src/lib.rs
View file

@ -10,12 +10,12 @@ mod thread_bus;
mod ui;
mod wasm_vm;
use log::info;
use std::{
path::PathBuf,
sync::{Arc, Mutex, RwLock},
thread,
};
use log::info;
use zellij_utils::zellij_tile;
use wasmer::Store;

16
zellij-utils/src/input/layout.rs
View file

@ -258,14 +258,14 @@ impl Layout {
post_tab = true;
// Leaf
} else if post_tab {
if curr_post_layout.is_empty() {
let mut part_no_tab = part.clone();
part_no_tab.tabs.clear();
part_no_tab.parts.clear();
post_tab_layout.push(part_no_tab);
} else {
post_tab_layout.append(&mut curr_post_layout);
}
if curr_post_layout.is_empty() {
let mut part_no_tab = part.clone();
part_no_tab.tabs.clear();
part_no_tab.parts.clear();
post_tab_layout.push(part_no_tab);
} else {
post_tab_layout.append(&mut curr_post_layout);
}
}
}
(pre_tab_layout, post_tab_layout, tabs)

6
zellij-utils/src/input/unit/layout_test.rs
View file

@ -532,7 +532,7 @@ fn no_tabs_specified_should_panic() {
// TODO Make error out of this
// Only untill #631 is fixed
fn multiple_tabs_specified_should_panic() {
let path = layout_test_dir("multiple-tabs-should-panic.yaml".into());
let layout = Layout::new(&path);
let _main_layout = layout.unwrap().construct_main_layout();
let path = layout_test_dir("multiple-tabs-should-panic.yaml".into());
let layout = Layout::new(&path);
let _main_layout = layout.unwrap().construct_main_layout();
}