From 032948f01ace1694d77aa1865d62aa8ade32247f Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Fri, 28 May 2021 11:10:11 +0200 Subject: [PATCH] rename filetree crate to prepare for publish --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- Makefile | 4 ++-- {filetree => filetreelist}/Cargo.toml | 6 +++--- {filetree => filetreelist}/LICENSE.md | 0 {filetree => filetreelist}/src/error.rs | 0 {filetree => filetreelist}/src/filetree.rs | 0 {filetree => filetreelist}/src/filetreeitems.rs | 0 {filetree => filetreelist}/src/item.rs | 0 {filetree => filetreelist}/src/lib.rs | 0 {filetree => filetreelist}/src/tree_iter.rs | 0 {filetree => filetreelist}/src/treeitems_iter.rs | 0 src/components/revision_files.rs | 4 ++-- src/components/syntax_text.rs | 2 +- src/ui/mod.rs | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename {filetree => filetreelist}/Cargo.toml (64%) rename {filetree => filetreelist}/LICENSE.md (100%) rename {filetree => filetreelist}/src/error.rs (100%) rename {filetree => filetreelist}/src/filetree.rs (100%) rename {filetree => filetreelist}/src/filetreeitems.rs (100%) rename {filetree => filetreelist}/src/item.rs (100%) rename {filetree => filetreelist}/src/lib.rs (100%) rename {filetree => filetreelist}/src/tree_iter.rs (100%) rename {filetree => filetreelist}/src/treeitems_iter.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 899caa16..1dec6fa8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -373,7 +373,7 @@ dependencies = [ ] [[package]] -name = "filetree" +name = "filetreelist" version = "0.1.0" dependencies = [ "pretty_assertions", @@ -478,7 +478,7 @@ dependencies = [ "crossterm", "dirs-next", "easy-cast", - "filetree", + "filetreelist", "itertools", "lazy_static", "log", diff --git a/Cargo.toml b/Cargo.toml index 0c53a689..c4efb74f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ keywords = [ [dependencies] scopetime = { path = "./scopetime", version = "0.1" } asyncgit = { path = "./asyncgit", version = "0.16" } -filetree = { path = "./filetree" } +filetreelist = { path = "./filetreelist", version = "0.1" } crossterm = { version = "0.19", features = [ "serde" ] } clap = { version = "2.33", default-features = false } tui = { version = "0.15", default-features = false, features = ['crossterm', 'serde'] } @@ -66,7 +66,7 @@ timing=["scopetime/enabled"] members=[ "asyncgit", "scopetime", - "filetree", + "filetreelist", ] [profile.release] diff --git a/Makefile b/Makefile index 8839c60b..3eaafd55 100644 --- a/Makefile +++ b/Makefile @@ -45,12 +45,12 @@ fmt: clippy: touch src/main.rs - cargo clean -p gitui -p asyncgit -p scopetime -p filetree + cargo clean -p gitui -p asyncgit -p scopetime -p filetreelist cargo clippy --workspace --all-features clippy-nightly: touch src/main.rs - cargo clean -p gitui -p asyncgit -p scopetime -p filetree + cargo clean -p gitui -p asyncgit -p scopetime -p filetreelist cargo +nightly clippy --workspace --all-features check: fmt clippy test diff --git a/filetree/Cargo.toml b/filetreelist/Cargo.toml similarity index 64% rename from filetree/Cargo.toml rename to filetreelist/Cargo.toml index 0e341baa..6d5037a6 100644 --- a/filetree/Cargo.toml +++ b/filetreelist/Cargo.toml @@ -1,15 +1,15 @@ [package] -name = "filetree" +name = "filetreelist" version = "0.1.0" authors = ["Stephan Dilly "] edition = "2018" -description = "filetree abstraction based on a sorted path list" +description = "filetree abstraction based on a sorted path list, supports key based navigation events, folding, scrolling and more" homepage = "https://github.com/extrawurst/gitui" repository = "https://github.com/extrawurst/gitui" readme = "README.md" license-file = "LICENSE.md" categories = ["command-line-utilities"] -keywords = ["gui","cli","terminal","ui"] +keywords = ["gui","cli","terminal","ui","tui"] [dependencies] thiserror = "1.0" diff --git a/filetree/LICENSE.md b/filetreelist/LICENSE.md similarity index 100% rename from filetree/LICENSE.md rename to filetreelist/LICENSE.md diff --git a/filetree/src/error.rs b/filetreelist/src/error.rs similarity index 100% rename from filetree/src/error.rs rename to filetreelist/src/error.rs diff --git a/filetree/src/filetree.rs b/filetreelist/src/filetree.rs similarity index 100% rename from filetree/src/filetree.rs rename to filetreelist/src/filetree.rs diff --git a/filetree/src/filetreeitems.rs b/filetreelist/src/filetreeitems.rs similarity index 100% rename from filetree/src/filetreeitems.rs rename to filetreelist/src/filetreeitems.rs diff --git a/filetree/src/item.rs b/filetreelist/src/item.rs similarity index 100% rename from filetree/src/item.rs rename to filetreelist/src/item.rs diff --git a/filetree/src/lib.rs b/filetreelist/src/lib.rs similarity index 100% rename from filetree/src/lib.rs rename to filetreelist/src/lib.rs diff --git a/filetree/src/tree_iter.rs b/filetreelist/src/tree_iter.rs similarity index 100% rename from filetree/src/tree_iter.rs rename to filetreelist/src/tree_iter.rs diff --git a/filetree/src/treeitems_iter.rs b/filetreelist/src/treeitems_iter.rs similarity index 100% rename from filetree/src/treeitems_iter.rs rename to filetreelist/src/treeitems_iter.rs diff --git a/src/components/revision_files.rs b/src/components/revision_files.rs index 3169a923..1b3fefb9 100644 --- a/src/components/revision_files.rs +++ b/src/components/revision_files.rs @@ -15,7 +15,7 @@ use asyncgit::{ }; use crossbeam_channel::Sender; use crossterm::event::Event; -use filetree::FileTree; +use filetreelist::{FileTree, FileTreeItem}; use std::{ cell::Cell, collections::BTreeSet, convert::From, path::Path, }; @@ -104,7 +104,7 @@ impl RevisionFilesComponent { } fn tree_item_to_span<'a>( - item: &'a filetree::FileTreeItem, + item: &'a FileTreeItem, theme: &SharedTheme, selected: bool, ) -> Span<'a> { diff --git a/src/components/syntax_text.rs b/src/components/syntax_text.rs index 57946ac1..8cacf805 100644 --- a/src/components/syntax_text.rs +++ b/src/components/syntax_text.rs @@ -18,7 +18,7 @@ use asyncgit::{ }; use crossbeam_channel::Sender; use crossterm::event::Event; -use filetree::MoveSelection; +use filetreelist::MoveSelection; use itertools::Either; use std::{cell::Cell, convert::From, path::Path}; use tui::{ diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 7734b08d..ae143085 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -5,7 +5,7 @@ mod stateful_paragraph; pub mod style; mod syntax_text; -use filetree::MoveSelection; +use filetreelist::MoveSelection; pub use scrollbar::draw_scrollbar; pub use scrolllist::{draw_list, draw_list_block}; pub use stateful_paragraph::{