From 16fa4d45c1e18d699d02c07df4265495251bd9b7 Mon Sep 17 00:00:00 2001 From: graelo Date: Sat, 20 Mar 2021 22:58:09 +0100 Subject: [PATCH] refactor: outputdestination.rs -> comm/output_destination.rs --- src/bin/tmux_copyrat.rs | 7 ++++++- src/comm/mod.rs | 3 +++ src/{ => comm}/output_destination.rs | 0 src/lib.rs | 3 +-- src/ui/selection.rs | 2 +- src/ui/vc.rs | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) rename src/{ => comm}/output_destination.rs (100%) diff --git a/src/bin/tmux_copyrat.rs b/src/bin/tmux_copyrat.rs index 702ad41..8cb4299 100644 --- a/src/bin/tmux_copyrat.rs +++ b/src/bin/tmux_copyrat.rs @@ -2,7 +2,12 @@ use clap::Clap; use std::collections::HashMap; use std::str::FromStr; -use copyrat::{comm::tmux, error, output_destination::OutputDestination, ui::Selection, CliOpt}; +use copyrat::{ + comm::{tmux, OutputDestination}, + error, + ui::Selection, + CliOpt, +}; /// Main configuration, parsed from command line. #[derive(Clap, Debug)] diff --git a/src/comm/mod.rs b/src/comm/mod.rs index ee3d575..288979e 100644 --- a/src/comm/mod.rs +++ b/src/comm/mod.rs @@ -1 +1,4 @@ +mod output_destination; pub mod tmux; + +pub use output_destination::OutputDestination; diff --git a/src/output_destination.rs b/src/comm/output_destination.rs similarity index 100% rename from src/output_destination.rs rename to src/comm/output_destination.rs diff --git a/src/lib.rs b/src/lib.rs index d8825b9..7ef5227 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,5 @@ pub mod comm; pub mod error; -pub mod output_destination; pub mod textbuf; pub mod ui; @@ -40,7 +39,7 @@ pub fn run(buffer: String, opt: &CliOpt) -> Option { }, }; - let default_output_destination = output_destination::OutputDestination::Tmux; + let default_output_destination = comm::OutputDestination::Tmux; let selection: Option = { let mut ui = ui::ViewController::new( diff --git a/src/ui/selection.rs b/src/ui/selection.rs index 374a59d..efa8ed8 100644 --- a/src/ui/selection.rs +++ b/src/ui/selection.rs @@ -1,4 +1,4 @@ -use crate::output_destination::OutputDestination; +use crate::comm::OutputDestination; /// Represents the text selected by the user, along with if it was uppercased /// and the output destination (Tmux buffer or Clipboard). diff --git a/src/ui/vc.rs b/src/ui/vc.rs index 8ec32be..8966701 100644 --- a/src/ui/vc.rs +++ b/src/ui/vc.rs @@ -8,7 +8,7 @@ use termion::{self, color, cursor, event, style}; use super::colors::UiColors; use super::Selection; use super::{HintAlignment, HintStyle}; -use crate::{output_destination::OutputDestination, textbuf}; +use crate::{comm::OutputDestination, textbuf}; pub struct ViewController<'a> { model: &'a mut textbuf::Model<'a>,