style(fmt): fix warnings (#3223)
* fix warnings in zellij-server * style(fmt): remove warnings * style(fmt): rustfmt
This commit is contained in:
parent
8b2263ecf3
commit
223730f04a
7 changed files with 13 additions and 13 deletions
|
|
@ -443,7 +443,7 @@ struct RawFdAsyncReader {
|
||||||
impl RawFdAsyncReader {
|
impl RawFdAsyncReader {
|
||||||
fn new(fd: RawFd) -> RawFdAsyncReader {
|
fn new(fd: RawFd) -> RawFdAsyncReader {
|
||||||
RawFdAsyncReader {
|
RawFdAsyncReader {
|
||||||
/// The supplied `RawFd` is consumed by the created `RawFdAsyncReader`, closing it when dropped
|
// The supplied `RawFd` is consumed by the created `RawFdAsyncReader`, closing it when dropped
|
||||||
fd: unsafe { AsyncFile::from_raw_fd(fd) },
|
fd: unsafe { AsyncFile::from_raw_fd(fd) },
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ use zellij_utils::{
|
||||||
data::{ModeInfo, Style},
|
data::{ModeInfo, Style},
|
||||||
errors::prelude::*,
|
errors::prelude::*,
|
||||||
input::command::RunCommand,
|
input::command::RunCommand,
|
||||||
input::layout::{FloatingPaneLayout, Run, RunPlugin, RunPluginOrAlias},
|
input::layout::{FloatingPaneLayout, Run, RunPluginOrAlias},
|
||||||
pane_size::{Dimension, Offset, PaneGeom, Size, SizeInPixels, Viewport},
|
pane_size::{Dimension, Offset, PaneGeom, Size, SizeInPixels, Viewport},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ use zellij_utils::{
|
||||||
errors::prelude::*,
|
errors::prelude::*,
|
||||||
input::{
|
input::{
|
||||||
command::RunCommand,
|
command::RunCommand,
|
||||||
layout::{Run, RunPlugin, RunPluginOrAlias, SplitDirection},
|
layout::{Run, RunPluginOrAlias, SplitDirection},
|
||||||
},
|
},
|
||||||
pane_size::{Offset, PaneGeom, Size, SizeInPixels, Viewport},
|
pane_size::{Offset, PaneGeom, Size, SizeInPixels, Viewport},
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,7 @@ use zellij_utils::{
|
||||||
errors::{ContextType, PtyContext},
|
errors::{ContextType, PtyContext},
|
||||||
input::{
|
input::{
|
||||||
command::{RunCommand, TerminalAction},
|
command::{RunCommand, TerminalAction},
|
||||||
layout::{
|
layout::{FloatingPaneLayout, Layout, Run, RunPluginOrAlias, TiledPaneLayout},
|
||||||
FloatingPaneLayout, Layout, PluginUserConfiguration, Run, RunPluginLocation,
|
|
||||||
RunPluginOrAlias, TiledPaneLayout,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
pane_size::Size,
|
pane_size::Size,
|
||||||
session_serialization,
|
session_serialization,
|
||||||
|
|
@ -1344,7 +1341,9 @@ impl Pty {
|
||||||
size: Size,
|
size: Size,
|
||||||
skip_cache: bool,
|
skip_cache: bool,
|
||||||
cwd: Option<PathBuf>,
|
cwd: Option<PathBuf>,
|
||||||
floating_pane_coordinates: Option<FloatingPaneCoordinates>,
|
// left here for historical and potential future reasons since we might change the ordering
|
||||||
|
// of the pipeline between threads and end up needing to forward this
|
||||||
|
_floating_pane_coordinates: Option<FloatingPaneCoordinates>,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
let cwd = cwd.or_else(|| {
|
let cwd = cwd.or_else(|| {
|
||||||
self.active_panes
|
self.active_panes
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ use zellij_utils::{
|
||||||
envs::set_session_name,
|
envs::set_session_name,
|
||||||
input::command::TerminalAction,
|
input::command::TerminalAction,
|
||||||
input::layout::{
|
input::layout::{
|
||||||
FloatingPaneLayout, Layout, Run, RunPlugin, RunPluginLocation, RunPluginOrAlias,
|
FloatingPaneLayout, Layout, Run, RunPluginOrAlias, SwapFloatingLayout, SwapTiledLayout,
|
||||||
SwapFloatingLayout, SwapTiledLayout, TiledPaneLayout,
|
TiledPaneLayout,
|
||||||
},
|
},
|
||||||
position::Position,
|
position::Position,
|
||||||
};
|
};
|
||||||
|
|
@ -3865,7 +3865,7 @@ pub(crate) fn screen_thread_main(
|
||||||
// update state
|
// update state
|
||||||
screen.session_name = name.clone();
|
screen.session_name = name.clone();
|
||||||
screen.default_mode_info.session_name = Some(name.clone());
|
screen.default_mode_info.session_name = Some(name.clone());
|
||||||
for (_client_id, mut mode_info) in screen.mode_info.iter_mut() {
|
for (_client_id, mode_info) in screen.mode_info.iter_mut() {
|
||||||
mode_info.session_name = Some(name.clone());
|
mode_info.session_name = Some(name.clone());
|
||||||
}
|
}
|
||||||
for (_, tab) in screen.tabs.iter_mut() {
|
for (_, tab) in screen.tabs.iter_mut() {
|
||||||
|
|
|
||||||
|
|
@ -50,8 +50,8 @@ use zellij_utils::{
|
||||||
input::{
|
input::{
|
||||||
command::TerminalAction,
|
command::TerminalAction,
|
||||||
layout::{
|
layout::{
|
||||||
FloatingPaneLayout, PluginUserConfiguration, Run, RunPlugin, RunPluginLocation,
|
FloatingPaneLayout, Run, RunPluginOrAlias, SwapFloatingLayout, SwapTiledLayout,
|
||||||
RunPluginOrAlias, SwapFloatingLayout, SwapTiledLayout, TiledPaneLayout,
|
TiledPaneLayout,
|
||||||
},
|
},
|
||||||
parse_keys,
|
parse_keys,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@ pub use super::generated_api::api::{
|
||||||
key::Key as ProtobufKey,
|
key::Key as ProtobufKey,
|
||||||
style::Style as ProtobufStyle,
|
style::Style as ProtobufStyle,
|
||||||
};
|
};
|
||||||
|
#[allow(hidden_glob_reexports)]
|
||||||
use crate::data::{
|
use crate::data::{
|
||||||
CopyDestination, Event, EventType, FileMetadata, InputMode, Key, LayoutInfo, ModeInfo, Mouse,
|
CopyDestination, Event, EventType, FileMetadata, InputMode, Key, LayoutInfo, ModeInfo, Mouse,
|
||||||
PaneInfo, PaneManifest, PermissionStatus, PluginCapabilities, SessionInfo, Style, TabInfo,
|
PaneInfo, PaneManifest, PermissionStatus, PluginCapabilities, SessionInfo, Style, TabInfo,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue