From 9a48f7f536310e5e8267b85e94ad6e840fe94483 Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Fri, 2 Oct 2020 17:33:30 -0700 Subject: [PATCH] move localtab into mux --- src/main.rs | 1 - src/mux/domain.rs | 2 +- src/{ => mux}/localtab.rs | 0 src/mux/mod.rs | 1 + src/ssh.rs | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename src/{ => mux}/localtab.rs (100%) diff --git a/src/main.rs b/src/main.rs index cbc82d568..4af593c02 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,6 @@ mod scripting; mod connui; mod frontend; use config::keyassignment; -mod localtab; mod markdown; mod mux; mod server; diff --git a/src/mux/domain.rs b/src/mux/domain.rs index 5cda856de..d3e8b1e25 100644 --- a/src/mux/domain.rs +++ b/src/mux/domain.rs @@ -5,7 +5,7 @@ //! container or actually remote, running on the other end //! of an ssh session somewhere. -use crate::localtab::LocalPane; +use crate::mux::localtab::LocalPane; use crate::mux::pane::{alloc_pane_id, Pane, PaneId}; use crate::mux::tab::{SplitDirection, Tab, TabId}; use crate::mux::window::WindowId; diff --git a/src/localtab.rs b/src/mux/localtab.rs similarity index 100% rename from src/localtab.rs rename to src/mux/localtab.rs diff --git a/src/mux/mod.rs b/src/mux/mod.rs index f4aa93701..5313b228f 100644 --- a/src/mux/mod.rs +++ b/src/mux/mod.rs @@ -16,6 +16,7 @@ use std::thread; use thiserror::*; pub mod domain; +pub mod localtab; pub mod pane; pub mod renderable; pub mod tab; diff --git a/src/ssh.rs b/src/ssh.rs index c87f85f7f..8d9ea560d 100644 --- a/src/ssh.rs +++ b/src/ssh.rs @@ -1,6 +1,6 @@ use crate::connui::ConnectionUI; -use crate::localtab::LocalPane; use crate::mux::domain::{alloc_domain_id, Domain, DomainId, DomainState}; +use crate::mux::localtab::LocalPane; use crate::mux::pane::{alloc_pane_id, Pane, PaneId}; use crate::mux::tab::{SplitDirection, Tab, TabId}; use crate::mux::window::WindowId;