From 1c9268d2ffae8b4775134c75316f9273fd060df4 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Sun, 31 Dec 2023 08:38:16 -0400 Subject: [PATCH] Remove some unused dependencies (#9330) --- Cargo.lock | 13 ------------- crates/ruff_cli/Cargo.toml | 6 ------ crates/ruff_dev/Cargo.toml | 5 +---- crates/ruff_python_ast/Cargo.toml | 2 -- crates/ruff_python_index/Cargo.toml | 2 -- crates/ruff_wasm/Cargo.toml | 1 - fuzz/Cargo.toml | 7 +++---- 7 files changed, 4 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ec9c3b2ac..6bf42307d2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2075,7 +2075,6 @@ dependencies = [ name = "ruff_cli" version = "0.1.9" dependencies = [ - "annotate-snippets 0.9.2", "anyhow", "argfile", "assert_cmd", @@ -2088,7 +2087,6 @@ dependencies = [ "clearscreen", "colored", "filetime", - "glob", "ignore", "insta", "insta-cmd", @@ -2102,14 +2100,11 @@ dependencies = [ "regex", "ruff_cache", "ruff_diagnostics", - "ruff_formatter", "ruff_linter", "ruff_macros", "ruff_notebook", "ruff_python_ast", "ruff_python_formatter", - "ruff_python_stdlib", - "ruff_python_trivia", "ruff_source_file", "ruff_text_size", "ruff_workspace", @@ -2117,7 +2112,6 @@ dependencies = [ "serde", "serde_json", "shellexpand", - "similar", "strum", "tempfile", "test-case", @@ -2141,7 +2135,6 @@ dependencies = [ "indoc", "itertools 0.11.0", "libcst", - "once_cell", "pretty_assertions", "rayon", "regex", @@ -2153,7 +2146,6 @@ dependencies = [ "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", - "ruff_python_literal", "ruff_python_parser", "ruff_python_stdlib", "ruff_python_trivia", @@ -2163,7 +2155,6 @@ dependencies = [ "serde_json", "similar", "strum", - "strum_macros", "tempfile", "toml", "tracing", @@ -2311,8 +2302,6 @@ dependencies = [ "insta", "is-macro", "itertools 0.11.0", - "memchr", - "once_cell", "ruff_python_parser", "ruff_python_trivia", "ruff_source_file", @@ -2372,7 +2361,6 @@ dependencies = [ name = "ruff_python_index" version = "0.0.0" dependencies = [ - "itertools 0.11.0", "ruff_python_ast", "ruff_python_parser", "ruff_python_trivia", @@ -2506,7 +2494,6 @@ dependencies = [ "console_log", "js-sys", "log", - "ruff_diagnostics", "ruff_formatter", "ruff_linter", "ruff_python_ast", diff --git a/crates/ruff_cli/Cargo.toml b/crates/ruff_cli/Cargo.toml index 32f16b4275..17f71251f3 100644 --- a/crates/ruff_cli/Cargo.toml +++ b/crates/ruff_cli/Cargo.toml @@ -18,17 +18,14 @@ name = "ruff" ruff_linter = { path = "../ruff_linter", features = ["clap"] } ruff_cache = { path = "../ruff_cache" } ruff_diagnostics = { path = "../ruff_diagnostics" } -ruff_formatter = { path = "../ruff_formatter" } ruff_notebook = { path = "../ruff_notebook" } ruff_macros = { path = "../ruff_macros" } ruff_python_ast = { path = "../ruff_python_ast" } ruff_python_formatter = { path = "../ruff_python_formatter" } ruff_source_file = { path = "../ruff_source_file" } -ruff_python_trivia = { path = "../ruff_python_trivia" } ruff_workspace = { path = "../ruff_workspace" } ruff_text_size = { path = "../ruff_text_size" } -annotate-snippets = { version = "0.9.2", features = ["color"] } anyhow = { workspace = true } argfile = { version = "0.1.6" } bincode = { version = "1.3.3" } @@ -40,7 +37,6 @@ clap_complete_command = { version = "0.5.1" } clearscreen = { version = "2.0.0" } colored = { workspace = true } filetime = { workspace = true } -glob = { workspace = true } ignore = { workspace = true } is-macro = { workspace = true } itertools = { workspace = true } @@ -49,12 +45,10 @@ notify = { version = "6.1.1" } path-absolutize = { workspace = true, features = ["once_cell_cache"] } rayon = { version = "1.8.0" } regex = { workspace = true } -ruff_python_stdlib = { path = "../ruff_python_stdlib" } rustc-hash = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } shellexpand = { workspace = true } -similar = { workspace = true } strum = { workspace = true, features = [] } thiserror = { workspace = true } tracing = { workspace = true, features = ["log"] } diff --git a/crates/ruff_dev/Cargo.toml b/crates/ruff_dev/Cargo.toml index d17e22289c..b749ce0b4e 100644 --- a/crates/ruff_dev/Cargo.toml +++ b/crates/ruff_dev/Cargo.toml @@ -19,7 +19,6 @@ ruff_python_ast = { path = "../ruff_python_ast" } ruff_python_codegen = { path = "../ruff_python_codegen" } ruff_python_formatter = { path = "../ruff_python_formatter" } ruff_notebook = { path = "../ruff_notebook" } -ruff_python_literal = { path = "../ruff_python_literal" } ruff_python_parser = { path = "../ruff_python_parser" } ruff_python_stdlib = { path = "../ruff_python_stdlib" } ruff_python_trivia = { path = "../ruff_python_trivia" } @@ -28,10 +27,10 @@ ruff_workspace = { path = "../ruff_workspace", features = ["schemars"]} anyhow = { workspace = true } clap = { workspace = true } ignore = { workspace = true } +imara-diff = "0.1.5" indicatif = "0.17.7" itertools = { workspace = true } libcst = { workspace = true } -once_cell = { workspace = true } pretty_assertions = { version = "1.3.0" } rayon = "1.8.0" regex = { workspace = true } @@ -40,13 +39,11 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } similar = { workspace = true } strum = { workspace = true } -strum_macros = { workspace = true } tempfile = "3.8.1" toml = { workspace = true, features = ["parse"] } tracing = { workspace = true } tracing-indicatif = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter"] } -imara-diff = "0.1.5" [dev-dependencies] indoc = "2.0.4" diff --git a/crates/ruff_python_ast/Cargo.toml b/crates/ruff_python_ast/Cargo.toml index 460bdf48c9..b879204c53 100644 --- a/crates/ruff_python_ast/Cargo.toml +++ b/crates/ruff_python_ast/Cargo.toml @@ -20,8 +20,6 @@ ruff_text_size = { path = "../ruff_text_size" } bitflags = { workspace = true } is-macro = { workspace = true } itertools = { workspace = true } -memchr = { workspace = true } -once_cell = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true, optional = true } smallvec = { workspace = true } diff --git a/crates/ruff_python_index/Cargo.toml b/crates/ruff_python_index/Cargo.toml index 1d58538623..bd080c6a36 100644 --- a/crates/ruff_python_index/Cargo.toml +++ b/crates/ruff_python_index/Cargo.toml @@ -20,8 +20,6 @@ ruff_python_parser = { path = "../ruff_python_parser" } ruff_source_file = { path = "../ruff_source_file" } ruff_text_size = { path = "../ruff_text_size" } -itertools = { workspace = true } - [dev-dependencies] [lints] diff --git a/crates/ruff_wasm/Cargo.toml b/crates/ruff_wasm/Cargo.toml index 861862b54d..75563b8689 100644 --- a/crates/ruff_wasm/Cargo.toml +++ b/crates/ruff_wasm/Cargo.toml @@ -19,7 +19,6 @@ default = ["console_error_panic_hook"] [dependencies] ruff_linter = { path = "../ruff_linter" } -ruff_diagnostics = { path = "../ruff_diagnostics" } ruff_python_ast = { path = "../ruff_python_ast" } ruff_python_codegen = { path = "../ruff_python_codegen" } ruff_formatter = { path = "../ruff_formatter" } diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index bce1c8f9f3..3e3f05f555 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -17,14 +17,13 @@ libfuzzer = ["libfuzzer-sys/link_libfuzzer"] cargo-fuzz = true [dependencies] -arbitrary = { version = "1.3.0", features = ["derive"] } -libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false } ruff_linter = { path = "../crates/ruff_linter" } -ruff_python_ast = { path = "../crates/ruff_python_ast" } ruff_python_codegen = { path = "../crates/ruff_python_codegen" } -ruff_python_formatter = { path = "../crates/ruff_python_formatter" } ruff_python_parser = { path = "../crates/ruff_python_parser" } ruff_source_file = { path = "../crates/ruff_source_file" } + +arbitrary = { version = "1.3.0", features = ["derive"] } +libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer", default-features = false } similar = { version = "2.2.1" } # Prevent this from interfering with workspaces