From 33542e9ddbd5776727531eb19d2eda83449a592e Mon Sep 17 00:00:00 2001 From: wongjiahau Date: Wed, 22 Mar 2023 11:34:59 +0800 Subject: [PATCH] refactor: remove unnecessary dev-dependencies - Resolve https://github.com/helix-editor/helix/pull/5768/files#r1126720143 --- Cargo.lock | 124 ---------------------------------- helix-term/Cargo.toml | 2 - helix-term/src/ui/explorer.rs | 41 ++++++----- helix-term/src/ui/tree.rs | 1 - 4 files changed, 25 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0cd6a37c..af0858ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,20 +94,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "build-fs-tree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85199b032e7d08f84570a62dc4b59d4ef37e094939d634e9dddd161515ec3ba9" -dependencies = [ - "derive_more", - "pipe-trait", - "serde", - "serde_yaml", - "text-block-macros", - "thiserror", -] - [[package]] name = "bumpalo" version = "3.11.1" @@ -203,12 +189,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "core-foundation-sys" version = "0.8.3" @@ -250,16 +230,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "cxx" version = "1.0.82" @@ -304,25 +274,6 @@ dependencies = [ "syn", ] -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - [[package]] name = "dirs" version = "4.0.0" @@ -1209,7 +1160,6 @@ version = "0.6.0" dependencies = [ "anyhow", "arc-swap", - "build-fs-tree", "chrono", "content_inspector", "crossterm", @@ -1230,7 +1180,6 @@ dependencies = [ "libc", "log", "once_cell", - "pretty_assertions", "pulldown-cmark", "serde", "serde_json", @@ -1627,15 +1576,6 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1677,24 +1617,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pipe-trait" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2" - -[[package]] -name = "pretty_assertions" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" -dependencies = [ - "ctor", - "diff", - "output_vt100", - "yansi", -] - [[package]] name = "proc-macro2" version = "1.0.47" @@ -1810,15 +1732,6 @@ dependencies = [ "str_indices", ] -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.36.7" @@ -1860,12 +1773,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - [[package]] name = "serde" version = "1.0.155" @@ -1917,19 +1824,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.9.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82e6c8c047aa50a7328632d067bcae6ef38772a79e28daf32f735e0e4f3dd10" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha1_smol" version = "1.0.0" @@ -2089,12 +1983,6 @@ dependencies = [ "dirs-next", ] -[[package]] -name = "text-block-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8b59b4da1c1717deaf1de80f0179a9d8b4ac91c986d5fd9f4a8ff177b84049" - [[package]] name = "textwrap" version = "0.16.0" @@ -2337,12 +2225,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "unsafe-libyaml" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" - [[package]] name = "url" version = "2.3.1" @@ -2589,9 +2471,3 @@ dependencies = [ "helix-view", "toml", ] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml index 9311d410..5222ddaa 100644 --- a/helix-term/Cargo.toml +++ b/helix-term/Cargo.toml @@ -77,5 +77,3 @@ helix-loader = { version = "0.6", path = "../helix-loader" } smallvec = "1.10" indoc = "2.0.1" tempfile = "3.4.0" -pretty_assertions = "1.3.0" -build-fs-tree = "0.4.1" diff --git a/helix-term/src/ui/explorer.rs b/helix-term/src/ui/explorer.rs index 5dc53d90..22d41192 100644 --- a/helix-term/src/ui/explorer.rs +++ b/helix-term/src/ui/explorer.rs @@ -754,29 +754,38 @@ mod test_explorer { use super::Explorer; use helix_view::graphics::Rect; - use pretty_assertions::assert_eq; use std::{fs, path::PathBuf}; + /// This code should create the following file tree: + /// + /// test_explorer/ + /// ├── index.html + /// ├── .gitignore + /// ├── scripts + /// │ └── main.js + /// └── styles + /// ├── style.css + /// └── public + /// └── file + /// fn dummy_file_tree(name: &str) -> PathBuf { - use build_fs_tree::{dir, file, Build, MergeableFileSystemTree}; - let tree = MergeableFileSystemTree::<&str, &str>::from(dir! { - "index.html" => file!("") - "scripts" => dir! { - "main.js" => file!("") - } - "styles" => dir! { - "style.css" => file!("") - "public" => dir! { - "file" => file!("") - } - } - ".gitignore" => file!("") - }); let path: PathBuf = format!("test_explorer{}{}", std::path::MAIN_SEPARATOR, name).into(); if path.exists() { fs::remove_dir_all(path.clone()).unwrap(); } - tree.build(&path).unwrap(); + fs::create_dir_all(path.clone()).unwrap(); + fs::write(path.join("index.html"), "").unwrap(); + fs::write(path.join(".gitignore"), "").unwrap(); + + fs::create_dir_all(path.join("scripts")).unwrap(); + fs::write(path.join("scripts").join("main.js"), "").unwrap(); + + fs::create_dir_all(path.join("styles")).unwrap(); + fs::write(path.join("styles").join("style.css"), "").unwrap(); + + fs::create_dir_all(path.join("styles").join("public")).unwrap(); + fs::write(path.join("styles").join("public").join("file"), "").unwrap(); + path } diff --git a/helix-term/src/ui/tree.rs b/helix-term/src/ui/tree.rs index 7199570e..c97c21c8 100644 --- a/helix-term/src/ui/tree.rs +++ b/helix-term/src/ui/tree.rs @@ -1218,7 +1218,6 @@ mod test_tree_view { use crate::compositor::Context; use super::{TreeView, TreeViewItem}; - use pretty_assertions::assert_eq; #[derive(PartialEq, Eq, PartialOrd, Ord, Clone)] /// The children of DivisibleItem is the division of itself.