diff --git a/src/frontend/guicommon/clipboard.rs b/src/clipboard.rs similarity index 100% rename from src/frontend/guicommon/clipboard.rs rename to src/clipboard.rs diff --git a/src/frontend/guicommon/mod.rs b/src/frontend/guicommon/mod.rs index 39c485b84..2e4cab22c 100644 --- a/src/frontend/guicommon/mod.rs +++ b/src/frontend/guicommon/mod.rs @@ -1,2 +1 @@ -pub mod clipboard; pub mod localtab; diff --git a/src/frontend/software/termwindow.rs b/src/frontend/software/termwindow.rs index 0c4a8cea9..ebbdb1a25 100644 --- a/src/frontend/software/termwindow.rs +++ b/src/frontend/software/termwindow.rs @@ -1,9 +1,9 @@ use super::quad::*; use super::renderstate::*; use super::utilsprites::RenderMetrics; +use crate::clipboard::SystemClipboard; use crate::config::Config; use crate::font::{FontConfiguration, FontSystemSelection}; -use crate::frontend::guicommon::clipboard::SystemClipboard; use crate::frontend::{front_end, gui_executor}; use crate::keyassignment::{KeyAssignment, KeyMap, SpawnTabDomain}; use crate::mux::renderable::Renderable; diff --git a/src/main.rs b/src/main.rs index aae1d48dd..6b1093cac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,11 +14,11 @@ use tabout::{tabulate_output, Alignment, Column}; use std::rc::Rc; use std::sync::Arc; +mod clipboard; mod config; mod frontend; mod keyassignment; mod mux; - mod ratelim; mod server; mod ssh; diff --git a/src/server/tab.rs b/src/server/tab.rs index f499daca0..02fa767e0 100644 --- a/src/server/tab.rs +++ b/src/server/tab.rs @@ -1,5 +1,5 @@ +use crate::clipboard::SystemClipboard; use crate::frontend::gui_executor; -use crate::frontend::guicommon::clipboard::SystemClipboard; use crate::mux::domain::DomainId; use crate::mux::renderable::Renderable; use crate::mux::tab::{alloc_tab_id, Tab, TabId};