From f5f87e41b14976bb69dae53cffcca5bf01147626 Mon Sep 17 00:00:00 2001 From: LoricAndre Date: Sun, 4 May 2025 18:13:36 +0200 Subject: [PATCH] fix: fix local dependencies --- Cargo.lock | 40 +++++++++++----------- skim-tuikit/README.md | 4 +-- skim-tuikit/examples/256color.rs | 2 +- skim-tuikit/examples/256color_on_screen.rs | 6 ++-- skim-tuikit/examples/custom-event.rs | 2 +- skim-tuikit/examples/get_keys.rs | 6 ++-- skim-tuikit/examples/hello-world.rs | 2 +- skim-tuikit/examples/split.rs | 2 +- skim-tuikit/examples/stack.rs | 2 +- skim-tuikit/examples/term_size.rs | 2 +- skim-tuikit/examples/termbox.rs | 2 +- skim-tuikit/examples/true_color.rs | 2 +- skim-tuikit/examples/win.rs | 2 +- skim-tuikit/src/lib.rs | 2 +- skim/src/ansi.rs | 2 +- skim/src/event.rs | 2 +- skim/src/header.rs | 2 +- skim/src/helper/item.rs | 2 +- skim/src/input.rs | 4 +-- skim/src/lib.rs | 6 ++-- skim/src/model/mod.rs | 2 +- skim/src/model/status.rs | 8 ++--- skim/src/output.rs | 2 +- skim/src/prelude.rs | 2 +- skim/src/previewer.rs | 2 +- skim/src/query.rs | 2 +- skim/src/selection.rs | 2 +- skim/src/theme.rs | 2 +- skim/src/tmux.rs | 2 +- skim/src/util.rs | 2 +- 30 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 500c2bb3..b218c73c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,10 +245,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" -[[package]] -name = "common" -version = "0.1.0" - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -908,7 +904,6 @@ dependencies = [ "bitflags 1.3.2", "chrono", "clap", - "common", "crossbeam", "defer-drop", "derive_builder", @@ -922,14 +917,33 @@ dependencies = [ "regex", "shell-quote", "shlex", + "skim-common", + "skim-tuikit", "time", "timer", - "tuikit", "unicode-width", "vte", "which", ] +[[package]] +name = "skim-common" +version = "0.1.0" + +[[package]] +name = "skim-tuikit" +version = "0.6.0" +dependencies = [ + "bitflags 1.3.2", + "env_logger", + "lazy_static", + "log", + "nix", + "skim-common", + "term", + "unicode-width", +] + [[package]] name = "strsim" version = "0.11.1" @@ -1029,20 +1043,6 @@ dependencies = [ "chrono", ] -[[package]] -name = "tuikit" -version = "0.6.0" -dependencies = [ - "bitflags 1.3.2", - "common", - "env_logger", - "lazy_static", - "log", - "nix", - "term", - "unicode-width", -] - [[package]] name = "unicase" version = "2.8.1" diff --git a/skim-tuikit/README.md b/skim-tuikit/README.md index d6dd5ff2..ee208ced 100644 --- a/skim-tuikit/README.md +++ b/skim-tuikit/README.md @@ -34,7 +34,7 @@ tuikit = { git = "https://github.com/lotabout/tuikit.git" } Here is an example (could also be run by `cargo run --example hello-world`): ```rust -use tuikit::prelude::*; +use skim_tuikit::prelude::*; use std::cmp::{min, max}; fn main() { @@ -78,7 +78,7 @@ fn main() { For example: ```rust -use tuikit::prelude::*; +use skim_tuikit::prelude::*; struct Model(String); diff --git a/skim-tuikit/examples/256color.rs b/skim-tuikit/examples/256color.rs index 45000bc5..4089a43f 100644 --- a/skim-tuikit/examples/256color.rs +++ b/skim-tuikit/examples/256color.rs @@ -1,5 +1,5 @@ +use skim_tuikit::attr::Color; use std::io; -use tuikit::attr::Color; use tuikit::output::Output; fn main() { diff --git a/skim-tuikit/examples/256color_on_screen.rs b/skim-tuikit/examples/256color_on_screen.rs index 39d517cf..49704f08 100644 --- a/skim-tuikit/examples/256color_on_screen.rs +++ b/skim-tuikit/examples/256color_on_screen.rs @@ -1,8 +1,8 @@ +use skim_tuikit::attr::{Attr, Color}; +use skim_tuikit::canvas::Canvas; +use skim_tuikit::screen::Screen; use std::io; -use tuikit::attr::{Attr, Color}; -use tuikit::canvas::Canvas; use tuikit::output::Output; -use tuikit::screen::Screen; fn main() { let mut output = Output::new(Box::new(io::stdout())).unwrap(); diff --git a/skim-tuikit/examples/custom-event.rs b/skim-tuikit/examples/custom-event.rs index 45564cdb..9873e9ca 100644 --- a/skim-tuikit/examples/custom-event.rs +++ b/skim-tuikit/examples/custom-event.rs @@ -1,6 +1,6 @@ use bitflags::_core::result::Result::Ok; -use tuikit::prelude::*; +use skim_tuikit::prelude::*; fn main() { let term: Term = Term::with_height(TermHeight::Percent(30)).expect("term creation error"); diff --git a/skim-tuikit/examples/get_keys.rs b/skim-tuikit/examples/get_keys.rs index 218b59a5..ebd92f83 100644 --- a/skim-tuikit/examples/get_keys.rs +++ b/skim-tuikit/examples/get_keys.rs @@ -1,8 +1,8 @@ +use skim_tuikit::input::KeyBoard; +use skim_tuikit::output::Output; +use skim_tuikit::raw::IntoRawMode; use std::time::Duration; -use tuikit::input::KeyBoard; use tuikit::key::Key; -use tuikit::output::Output; -use tuikit::raw::IntoRawMode; fn main() { let _stdout = std::io::stdout().into_raw_mode().unwrap(); diff --git a/skim-tuikit/examples/hello-world.rs b/skim-tuikit/examples/hello-world.rs index 8ffc2927..c1148b13 100644 --- a/skim-tuikit/examples/hello-world.rs +++ b/skim-tuikit/examples/hello-world.rs @@ -1,5 +1,5 @@ +use skim_tuikit::prelude::*; use std::cmp::{max, min}; -use tuikit::prelude::*; fn main() { let term: Term<()> = Term::with_height(TermHeight::Percent(30)).unwrap(); diff --git a/skim-tuikit/examples/split.rs b/skim-tuikit/examples/split.rs index e1ab1737..c3783884 100644 --- a/skim-tuikit/examples/split.rs +++ b/skim-tuikit/examples/split.rs @@ -1,4 +1,4 @@ -use tuikit::prelude::*; +use skim_tuikit::prelude::*; struct Fit(String); diff --git a/skim-tuikit/examples/stack.rs b/skim-tuikit/examples/stack.rs index 21616853..d2c1e254 100644 --- a/skim-tuikit/examples/stack.rs +++ b/skim-tuikit/examples/stack.rs @@ -1,4 +1,4 @@ -use tuikit::prelude::*; +use skim_tuikit::prelude::*; struct Model { win: String, diff --git a/skim-tuikit/examples/term_size.rs b/skim-tuikit/examples/term_size.rs index 992a0f7e..634837a1 100644 --- a/skim-tuikit/examples/term_size.rs +++ b/skim-tuikit/examples/term_size.rs @@ -1,5 +1,5 @@ +use skim_tuikit::output::Output; use std::io; -use tuikit::output::Output; fn main() { let output = Output::new(Box::new(io::stdout())).unwrap(); diff --git a/skim-tuikit/examples/termbox.rs b/skim-tuikit/examples/termbox.rs index 91ce1826..99de5802 100644 --- a/skim-tuikit/examples/termbox.rs +++ b/skim-tuikit/examples/termbox.rs @@ -1,7 +1,7 @@ +use skim_tuikit::prelude::*; use std::sync::Arc; use std::thread; use std::time::{Duration, Instant}; -use tuikit::prelude::*; extern crate env_logger; diff --git a/skim-tuikit/examples/true_color.rs b/skim-tuikit/examples/true_color.rs index 01f37b03..18381563 100644 --- a/skim-tuikit/examples/true_color.rs +++ b/skim-tuikit/examples/true_color.rs @@ -1,5 +1,5 @@ +use skim_tuikit::attr::Color; use std::io; -use tuikit::attr::Color; use tuikit::output::Output; // ported from: https://github.com/gnachman/iTerm2/blob/master/tests/24-bit-color.sh diff --git a/skim-tuikit/examples/win.rs b/skim-tuikit/examples/win.rs index 8c3c862f..75ec8ce5 100644 --- a/skim-tuikit/examples/win.rs +++ b/skim-tuikit/examples/win.rs @@ -1,4 +1,4 @@ -use tuikit::prelude::*; +use skim_tuikit::prelude::*; struct Model(String); diff --git a/skim-tuikit/src/lib.rs b/skim-tuikit/src/lib.rs index d41d4f17..a7610ad0 100644 --- a/skim-tuikit/src/lib.rs +++ b/skim-tuikit/src/lib.rs @@ -69,7 +69,7 @@ pub mod output; pub mod prelude; pub mod raw; pub mod screen; -use common::spinlock; +use skim_common::spinlock; mod sys; pub mod term; pub mod widget; diff --git a/skim/src/ansi.rs b/skim/src/ansi.rs index 396d7788..f03020e0 100644 --- a/skim/src/ansi.rs +++ b/skim/src/ansi.rs @@ -2,8 +2,8 @@ use std::default::Default; use beef::lean::Cow; +use skim_tuikit::prelude::*; use std::cmp::max; -use tuikit::prelude::*; use vte::{Params, Perform}; /// An ANSI Parser, will parse one line at a time. diff --git a/skim/src/event.rs b/skim/src/event.rs index 74fd278a..72ddb46a 100644 --- a/skim/src/event.rs +++ b/skim/src/event.rs @@ -1,7 +1,7 @@ // All the events that will be used +use skim_tuikit::key::Key; use std::sync::mpsc::{Receiver, Sender}; -use tuikit::key::Key; pub type EventReceiver = Receiver<(Key, Event)>; pub type EventSender = Sender<(Key, Event)>; diff --git a/skim/src/header.rs b/skim/src/header.rs index 3d2c1396..f72bce59 100644 --- a/skim/src/header.rs +++ b/skim/src/header.rs @@ -8,9 +8,9 @@ use crate::theme::DEFAULT_THEME; use crate::util::{clear_canvas, print_item, str_lines, LinePrinter}; use crate::{DisplayContext, Matches, SkimOptions}; use defer_drop::DeferDrop; +use skim_tuikit::prelude::*; use std::cmp::max; use std::sync::Arc; -use tuikit::prelude::*; pub struct Header { header: Vec>, diff --git a/skim/src/helper/item.rs b/skim/src/helper/item.rs index bc0876fd..9ddbd574 100644 --- a/skim/src/helper/item.rs +++ b/skim/src/helper/item.rs @@ -2,8 +2,8 @@ use crate::ansi::ANSIParser; use crate::field::{parse_matching_fields, parse_transform_fields, FieldRange}; use crate::{AnsiString, DisplayContext, Matches, SkimItem}; use regex::Regex; +use skim_tuikit::prelude::Attr; use std::borrow::Cow; -use tuikit::prelude::Attr; //------------------------------------------------------------------------------ /// An item will store everything that one line input will need to be operated and displayed. diff --git a/skim/src/input.rs b/skim/src/input.rs index abaa0f4e..4be3067e 100644 --- a/skim/src/input.rs +++ b/skim/src/input.rs @@ -2,10 +2,10 @@ //! keystrokes(such as Enter, Ctrl-p, Ctrl-n, etc) to the controller. use crate::event::{parse_event, Event}; use regex::Regex; +use skim_tuikit::event::Event as TermEvent; +use skim_tuikit::key::{from_keyname, Key}; use std::collections::HashMap; use std::sync::LazyLock; -use tuikit::event::Event as TermEvent; -use tuikit::key::{from_keyname, Key}; pub type ActionChain = Vec; diff --git a/skim/src/lib.rs b/skim/src/lib.rs index f0ec414f..27d338d7 100644 --- a/skim/src/lib.rs +++ b/skim/src/lib.rs @@ -10,7 +10,7 @@ use std::thread; use clap::ValueEnum; use crossbeam::channel::{Receiver, Sender}; -use tuikit::prelude::{Event as TermEvent, *}; +use skim_tuikit::prelude::{Event as TermEvent, *}; pub use crate::ansi::AnsiString; pub use crate::engine::fuzzy::FuzzyAlgorithm; @@ -20,8 +20,8 @@ use crate::model::Model; pub use crate::options::SkimOptions; pub use crate::output::SkimOutput; use crate::reader::Reader; -pub use common::spinlock; -pub use tuikit; +pub use skim_common::spinlock; +pub use skim_tuikit; mod ansi; mod engine; diff --git a/skim/src/model/mod.rs b/skim/src/model/mod.rs index bc1749c1..0394be3e 100644 --- a/skim/src/model/mod.rs +++ b/skim/src/model/mod.rs @@ -16,7 +16,7 @@ use chrono::Duration as TimerDuration; use defer_drop::DeferDrop; use regex::Regex; use timer::{Guard as TimerGuard, Timer}; -use tuikit::prelude::{Event as TermEvent, *}; +use skim_tuikit::prelude::{Event as TermEvent, *}; use crate::engine::factory::{AndOrEngineFactory, ExactOrFuzzyEngineFactory, RegexEngineFactory}; use crate::event::{Event, EventHandler, EventReceiver, EventSender}; diff --git a/skim/src/model/status.rs b/skim/src/model/status.rs index 0510c2eb..8f7dbde0 100644 --- a/skim/src/model/status.rs +++ b/skim/src/model/status.rs @@ -1,10 +1,10 @@ use std::sync::Arc; use std::time::Duration; -use tuikit::attr::{Attr, Effect}; -use tuikit::canvas::Canvas; -use tuikit::draw::{Draw, DrawResult}; -use tuikit::widget::Widget; +use skim_tuikit::attr::{Attr, Effect}; +use skim_tuikit::canvas::Canvas; +use skim_tuikit::draw::{Draw, DrawResult}; +use skim_tuikit::widget::Widget; use crate::event::Event; use crate::theme::ColorTheme; diff --git a/skim/src/output.rs b/skim/src/output.rs index 78ad5299..b5d19a5c 100644 --- a/skim/src/output.rs +++ b/skim/src/output.rs @@ -1,7 +1,7 @@ use crate::event::Event; use crate::SkimItem; +use skim_tuikit::key::Key; use std::sync::Arc; -use tuikit::key::Key; pub struct SkimOutput { /// The final event that makes skim accept/quit. diff --git a/skim/src/prelude.rs b/skim/src/prelude.rs index 3c937ff0..cdeb6ee1 100644 --- a/skim/src/prelude.rs +++ b/skim/src/prelude.rs @@ -8,9 +8,9 @@ pub use crate::output::SkimOutput; pub use crate::previewer::PreviewCallback; pub use crate::*; pub use crossbeam::channel::{bounded, unbounded, Receiver, Sender}; +pub use skim_tuikit::event::Key; pub use std::borrow::Cow; pub use std::cell::RefCell; pub use std::rc::Rc; pub use std::sync::atomic::{AtomicUsize, Ordering}; pub use std::sync::Arc; -pub use tuikit::event::Key; diff --git a/skim/src/previewer.rs b/skim/src/previewer.rs index 7abced60..9a6415b4 100644 --- a/skim/src/previewer.rs +++ b/skim/src/previewer.rs @@ -11,7 +11,7 @@ use std::thread::JoinHandle; use derive_builder::Builder; use nix::libc; use regex::Regex; -use tuikit::prelude::{Event as TermEvent, *}; +use skim_tuikit::prelude::{Event as TermEvent, *}; use crate::ansi::{ANSIParser, AnsiString}; use crate::event::{Event, EventHandler, UpdateScreen}; diff --git a/skim/src/query.rs b/skim/src/query.rs index e66ae8c1..7a090919 100644 --- a/skim/src/query.rs +++ b/skim/src/query.rs @@ -1,7 +1,7 @@ use std::mem; use std::sync::Arc; -use tuikit::prelude::*; +use skim_tuikit::prelude::*; use unicode_width::UnicodeWidthStr; use crate::event::{Event, EventHandler, UpdateScreen}; diff --git a/skim/src/selection.rs b/skim/src/selection.rs index 301ad58d..f84f57ab 100644 --- a/skim/src/selection.rs +++ b/skim/src/selection.rs @@ -4,7 +4,7 @@ use std::cmp::min; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; -use tuikit::prelude::{Event as TermEvent, *}; +use skim_tuikit::prelude::{Event as TermEvent, *}; use crate::event::{Event, EventHandler, UpdateScreen}; use crate::global::current_run_num; diff --git a/skim/src/theme.rs b/skim/src/theme.rs index 04272af5..8f0822c8 100644 --- a/skim/src/theme.rs +++ b/skim/src/theme.rs @@ -2,7 +2,7 @@ use std::sync::LazyLock; use crate::options::SkimOptions; -use tuikit::prelude::*; +use skim_tuikit::prelude::*; pub static DEFAULT_THEME: LazyLock = LazyLock::new(ColorTheme::dark256); diff --git a/skim/src/tmux.rs b/skim/src/tmux.rs index f4e36005..ed616ebc 100644 --- a/skim/src/tmux.rs +++ b/skim/src/tmux.rs @@ -10,7 +10,7 @@ use std::{ use nix::{sys::stat, unistd::mkfifo}; use rand::{distr::Alphanumeric, Rng}; -use tuikit::key::Key; +use skim_tuikit::key::Key; use which::which; use crate::{event::Event, SkimItem, SkimOptions, SkimOutput}; diff --git a/skim/src/util.rs b/skim/src/util.rs index 92128663..ba360ad4 100644 --- a/skim/src/util.rs +++ b/skim/src/util.rs @@ -7,7 +7,7 @@ use std::str::FromStr; use std::sync::LazyLock; use regex::{Captures, Regex}; -use tuikit::prelude::*; +use skim_tuikit::prelude::*; use unicode_width::UnicodeWidthChar; use crate::field::get_string_by_range;