rename utility to ferrite-utility

Cargo.toml

@@ -9,50 +9,50 @@ anyhow = "1.0.68"
 arboard = "3.2.0" 
 bitflags = "2.5.0" 
 blake3 = "1.5.1" 
-cb = { package = "crossbeam-channel", version = "0.5.8"}
+cb = {package = "crossbeam-channel", version = "0.5.8"} 
 cc = "1.0.79" 
 chardetng = "0.1.17" 
-clap = { version = "4.1.4", features = ["derive", "cargo"] }
+clap = {version = "4.1.4", features = ["derive", "cargo"]} 
 crossterm = "0.25.0" # Pinned to 0.25.0 because emoji are broken in newer versions
-csscolorparser = { version = "0.6.2", features = ["rgb"] }
-detect-indent = { git = "https://github.com/stefanpenner/detect-indent-rs", rev = "f645bcc" }
+csscolorparser = {version = "0.6.2", features = ["rgb"]} 
+detect-indent = {git = "https://github.com/stefanpenner/detect-indent-rs", rev = "f645bcc"} 
 directories = "5.0.0" 
 dunce = "1.0.4" 
 encoding_rs = "0.8.31" 
-ferrite-cli = { path = "ferrite-cli" }
-ferrite-core = { path = "ferrite-core" }
-ferrite-tui = { path = "ferrite-tui" }
-ferrite-tree-sitter = {path = "ferrite-tree-sitter" }
-flume = { version = "0.11.0", default-features = false }
-heck = "0.5.0"
-humansize = "2.1.3"
-ignore = "0.4.20"
-include_dir = "0.7.3"
-lexical-sort = "0.3.1"
-memchr = "2.5.0"
-notify = "6.0.0"
-num-traits = "0.2.15"
-once_cell = "1.17.1"
-rayon = "1.7.0"
-ropey = "1.5.1"
-serde = "1.0.152"
-serde_json = "1.0.115"
-slab = "0.4.8"
-sublime_fuzzy = "0.7.0"
-subprocess = "0.2.9"
-tempdir = "0.3.7"
-toml = "0.7.1"
-tracing = "0.1.40"
-tracing-log = "0.2.0"
-tracing-subscriber = "0.3.18"
-trash = "4.0.0"
-tree_magic_mini = "3.0.3"
-tree-sitter = "0.20.10"
-tui = { package = "ratatui", version = "0.26.0" }
-unicode-general-category = "0.6.0"
-unicode-segmentation = "1.10.0"
-unicode-width = "0.1.10"
-utility = {path = "utility"}
+ferrite-cli = {path = "ferrite-cli"} 
+ferrite-core = {path = "ferrite-core"} 
+ferrite-tree-sitter = {path = "ferrite-tree-sitter"} 
+ferrite-tui = {path = "ferrite-tui"} 
+ferrite-utility = {path = "ferrite-utility"} 
+flume = {version = "0.11.0", default-features = false} 
+heck = "0.5.0" 
+humansize = "2.1.3" 
+ignore = "0.4.20" 
+include_dir = "0.7.3" 
+lexical-sort = "0.3.1" 
+memchr = "2.5.0" 
+notify = "6.0.0" 
+num-traits = "0.2.15" 
+once_cell = "1.17.1" 
+rayon = "1.7.0" 
+ropey = "1.5.1" 
+serde = "1.0.152" 
+serde_json = "1.0.115" 
+slab = "0.4.8" 
+sublime_fuzzy = "0.7.0" 
+subprocess = "0.2.9" 
+tempdir = "0.3.7" 
+toml = "0.7.1" 
+tracing = "0.1.40" 
+tracing-log = "0.2.0" 
+tracing-subscriber = "0.3.18" 
+trash = "4.0.0" 
+tree-sitter = "0.20.10" 
+tree_magic_mini = "3.0.3" 
+tui = {package = "ratatui", version = "0.26.0"} 
+unicode-general-category = "0.6.0" 
+unicode-segmentation = "1.10.0" 
+unicode-width = "0.1.10" 
 
 [dependencies]
 anyhow.workspace = true
@@ -70,7 +70,7 @@ tracing.workspace = true
 opt-level = 3
 
 [workspace]
-members = ["ferrite-cli", "ferrite-core", "ferrite-tui", "ferrite-tree-sitter", "utility"]
+members = ["ferrite-cli", "ferrite-core", "ferrite-tui", "ferrite-tree-sitter", "ferrite-utility"]
 
 [[bin]]
 name = "fe"

ferrite-core/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 [dependencies]
 anyhow.workspace = true
 arboard.workspace = true
-blake3.workspace = true
 bitflags.workspace = true
+blake3.workspace = true
 cb.workspace = true
 chardetng.workspace = true
 csscolorparser = { workspace = true, features = ["rgb"] }
@@ -16,6 +16,7 @@ directories.workspace = true
 dunce.workspace = true
 encoding_rs.workspace = true
 ferrite-tree-sitter.workspace = true
+ferrite-utility.workspace = true
 flume = { workspace = true, default-features = false }
 heck.workspace = true
 humansize.workspace = true
@@ -35,9 +36,8 @@ subprocess.workspace = true
 toml.workspace = true 
 tracing.workspace = true 
 trash.workspace = true 
-tree-sitter.workspace = true 
 tree_magic_mini = { workspace = true, features = ["with-gpl-data"] }
-utility.workspace = true
+tree-sitter.workspace = true 
 unicode-segmentation.workspace = true
 unicode-width.workspace = true
 

ferrite-core/src/buffer.rs

@@ -9,13 +9,13 @@ use std::{
 };
 
 use encoding_rs::Encoding;
-use ropey::{Rope, RopeSlice};
-use serde::{Deserialize, Serialize};
-use utility::{
+use ferrite_utility::{
     graphemes::RopeGraphemeExt as _,
     line_ending::{rope_end_without_line_ending, LineEnding, DEFAULT_LINE_ENDING},
     point::Point,
 };
+use ropey::{Rope, RopeSlice};
+use serde::{Deserialize, Serialize};
 
 use self::{error::BufferError, history::History, search::BufferSearcher};
 use super::{

ferrite-core/src/buffer/buffer_tests.rs

@@ -1,7 +1,7 @@
 use std::fs;
 
+use ferrite_utility::line_ending::DEFAULT_LINE_ENDING;
 use tempdir::TempDir;
-use utility::line_ending::DEFAULT_LINE_ENDING;
 
 use super::{read, write};
 

ferrite-core/src/buffer/format.rs

@@ -1,8 +1,8 @@
 use std::time::Duration;
 
+use ferrite_utility::graphemes::ensure_grapheme_boundary_next_byte;
 use ropey::Rope;
 use subprocess::{Exec, PopenError, Redirection};
-use utility::graphemes::ensure_grapheme_boundary_next_byte;
 
 use super::{Buffer, Cursor};
 

ferrite-core/src/buffer/history.rs

@@ -1,7 +1,7 @@
 use std::{mem, ops::Range};
 
+use ferrite_utility::graphemes::ensure_grapheme_boundary_next_byte;
 use ropey::Rope;
-use utility::graphemes::ensure_grapheme_boundary_next_byte;
 
 use super::Cursor;
 

ferrite-core/src/buffer/search.rs

@@ -3,8 +3,8 @@ use std::{
     thread,
 };
 
+use ferrite_utility::{graphemes::RopeGraphemeExt as _, point::Point};
 use ropey::Rope;
-use utility::{graphemes::RopeGraphemeExt as _, point::Point};
 
 use crate::event_loop_proxy::EventLoopProxy;
 

ferrite-core/src/buffer/write.rs

@@ -5,8 +5,8 @@ use std::{
 };
 
 use encoding_rs::{CoderResult, Encoding};
+use ferrite_utility::{graphemes::RopeGraphemeExt, line_ending::LineEnding};
 use ropey::{Rope, RopeBuilder};
-use utility::{graphemes::RopeGraphemeExt, line_ending::LineEnding};
 
 use super::error::BufferError;
 

ferrite-core/src/indent.rs

@@ -1,8 +1,8 @@
 use std::num::NonZeroUsize;
 
 use detect_indent::IndentKind;
+use ferrite_utility::graphemes::TAB_WIDTH;
 use ropey::RopeSlice;
-use utility::graphemes::TAB_WIDTH;
 
 #[derive(Debug, Clone, Copy)]
 pub enum Indentation {

ferrite-core/src/keymap.rs

@@ -1,4 +1,4 @@
-use utility::point::Point;
+use ferrite_utility::point::Point;
 
 pub mod keycode;
 use keycode::{KeyCode, KeyModifiers};

ferrite-core/src/palette.rs

@@ -1,7 +1,7 @@
 use std::fmt::{self, Display};
 
+use ferrite_utility::{graphemes::RopeGraphemeExt, line_ending::LineEnding};
 use ropey::RopeSlice;
-use utility::{graphemes::RopeGraphemeExt, line_ending::LineEnding};
 
 use self::completer::{Completer, CompleterContext};
 use super::buffer::{error::BufferError, Buffer};

ferrite-core/src/palette/cmd.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use utility::line_ending::LineEnding;
+use ferrite_utility::line_ending::LineEnding;
 
 use crate::{buffer::case::Case, panes::Direction};
 

ferrite-core/src/palette/cmd_parser.rs

@@ -1,5 +1,5 @@
+use ferrite_utility::line_ending::LineEnding;
 use once_cell::sync::Lazy;
-use utility::line_ending::LineEnding;
 
 use self::generic_cmd::{CommandTemplate, CommandTemplateArg};
 use super::cmd::Command;

ferrite-core/src/palette/completer.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Cow, collections::HashMap, path::PathBuf};
 
-use utility::line_ending::LineEnding;
+use ferrite_utility::line_ending::LineEnding;
 
 use self::path_completer::complete_file_path;
 use super::cmd_parser::{

ferrite-core/src/search_buffer.rs

@@ -1,8 +1,8 @@
 use std::{borrow::Cow, sync::Arc, thread};
 
 use cb::select;
+use ferrite_utility::{graphemes::RopeGraphemeExt, line_ending::LineEnding};
 use ropey::RopeSlice;
-use utility::{graphemes::RopeGraphemeExt, line_ending::LineEnding};
 
 use self::fuzzy_match::FuzzyMatch;
 use super::buffer::{error::BufferError, Buffer};

ferrite-core/src/workspace.rs

@@ -4,9 +4,9 @@ use std::{
 };
 
 use anyhow::Result;
+use ferrite_utility::graphemes::RopeGraphemeExt;
 use serde::{Deserialize, Serialize};
 use slab::Slab;
-use utility::graphemes::RopeGraphemeExt;
 
 use super::buffer::{Buffer, Cursor};
 use crate::panes::{PaneKind, Panes};

ferrite-tui/Cargo.toml

@@ -17,4 +17,4 @@ subprocess.workspace = true
 tracing.workspace = true
 tui.workspace = true
 unicode-width.workspace = true
-utility.workspace = true
+ferrite-utility.workspace = true

ferrite-tui/src/lib.rs

@@ -35,11 +35,11 @@ use ferrite_core::{
     theme::EditorTheme,
     workspace::Workspace,
 };
+use ferrite_utility::{line_ending, point::Point};
 use glue::{ferrite_to_tui_rect, tui_to_ferrite_rect};
 use slab::Slab;
 use subprocess::{Exec, Redirection};
 use tui::layout::{Margin, Position, Rect};
-use utility::{line_ending, point::Point};
 
 use self::{
     event_loop::{TuiEvent, TuiEventLoop, TuiEventLoopControlFlow, TuiEventLoopProxy},

ferrite-tui/src/widgets/editor_widget.rs

@@ -4,16 +4,16 @@ use ferrite_core::{
     language::syntax::{Highlight, HighlightEvent},
     theme::EditorTheme,
 };
+use ferrite_utility::{
+    graphemes::{tab_width_at, RopeGraphemeExt, TAB_WIDTH},
+    point::Point,
+};
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
 use ropey::RopeSlice;
 use tui::{
     layout::Rect,
     widgets::{StatefulWidget, Widget},
 };
-use utility::{
-    graphemes::{tab_width_at, RopeGraphemeExt, TAB_WIDTH},
-    point::Point,
-};
 
 use super::info_line::InfoLine;
 use crate::{glue::convert_style, rect_ext::RectExt};

ferrite-tui/src/widgets/search_widget.rs

@@ -4,14 +4,14 @@ use ferrite_core::{
     search_buffer::{Matchable, SearchBuffer},
     theme::EditorTheme,
 };
+use ferrite_utility::graphemes::RopeGraphemeExt;
 use ropey::RopeSlice;
 use tui::{
     layout::{Margin, Rect},
     text::{Line, Span},
     widgets::{Block, BorderType, Borders, StatefulWidget, Widget},
 };
 use unicode_width::UnicodeWidthStr;
-use utility::graphemes::RopeGraphemeExt;
 
 use super::one_line_input_widget::OneLineInputWidget;
 use crate::glue::convert_style;

utility/Cargo.toml → ferrite-utility/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "utility"
+name = "ferrite-utility"
 version = "0.1.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html