Rename ruff_cli crate to ruff

astral-sh · Jan 16, 2024 · 61e6c08 · 61e6c08
1 parent 8788d57
commit 61e6c08
Show file tree

Hide file tree

Showing 57 changed files with 60 additions and 63 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ruff_cli/Cargo.toml → crates/ruff/Cargo.toml b/crates/ruff_cli/Cargo.toml → crates/ruff/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ruff_cli"
+name = "ruff"
 version = "0.1.13"
 publish = false
 authors = { workspace = true }
@@ -11,9 +11,6 @@ repository = { workspace = true }
 license = { workspace = true }
 readme = "../../README.md"
 
-[[bin]]
-name = "ruff"
-
 [dependencies]
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics" }

diff --git a/crates/ruff_cli/build.rs → crates/ruff/build.rs b/crates/ruff_cli/build.rs → crates/ruff/build.rs
diff --git a/...es/test/fixtures/cache_mutable/.gitignore → ...es/test/fixtures/cache_mutable/.gitignore b/...es/test/fixtures/cache_mutable/.gitignore → ...es/test/fixtures/cache_mutable/.gitignore
diff --git a/...fixtures/cache_remove_old_files/source.py → ...fixtures/cache_remove_old_files/source.py b/...fixtures/cache_remove_old_files/source.py → ...fixtures/cache_remove_old_files/source.py
diff --git a/..._cli/resources/test/fixtures/formatted.py → ...ruff/resources/test/fixtures/formatted.py b/..._cli/resources/test/fixtures/formatted.py → ...ruff/resources/test/fixtures/formatted.py
diff --git a/...resources/test/fixtures/include-test/a.py → ...resources/test/fixtures/include-test/a.py b/...resources/test/fixtures/include-test/a.py → ...resources/test/fixtures/include-test/a.py
diff --git a/...resources/test/fixtures/include-test/b.py → ...resources/test/fixtures/include-test/b.py b/...resources/test/fixtures/include-test/b.py → ...resources/test/fixtures/include-test/b.py
diff --git a/...fixtures/include-test/nested-project/e.py → ...fixtures/include-test/nested-project/e.py b/...fixtures/include-test/nested-project/e.py → ...fixtures/include-test/nested-project/e.py
diff --git a/...nclude-test/nested-project/pyproject.toml → ...nclude-test/nested-project/pyproject.toml b/...nclude-test/nested-project/pyproject.toml → ...nclude-test/nested-project/pyproject.toml
diff --git a/...test/fixtures/include-test/pyproject.toml → ...test/fixtures/include-test/pyproject.toml b/...test/fixtures/include-test/pyproject.toml → ...test/fixtures/include-test/pyproject.toml
diff --git a/...t/fixtures/include-test/subdirectory/c.py → ...t/fixtures/include-test/subdirectory/c.py b/...t/fixtures/include-test/subdirectory/c.py → ...t/fixtures/include-test/subdirectory/c.py
diff --git a/...t/fixtures/include-test/subdirectory/d.py → ...t/fixtures/include-test/subdirectory/d.py b/...t/fixtures/include-test/subdirectory/d.py → ...t/fixtures/include-test/subdirectory/d.py
diff --git a/...es/test/fixtures/trailing_semicolon.ipynb → ...es/test/fixtures/trailing_semicolon.ipynb b/...es/test/fixtures/trailing_semicolon.ipynb → ...es/test/fixtures/trailing_semicolon.ipynb
diff --git a/...resources/test/fixtures/unformatted.ipynb → ...resources/test/fixtures/unformatted.ipynb b/...resources/test/fixtures/unformatted.ipynb → ...resources/test/fixtures/unformatted.ipynb
diff --git a/...li/resources/test/fixtures/unformatted.py → ...ff/resources/test/fixtures/unformatted.py b/...li/resources/test/fixtures/unformatted.py → ...ff/resources/test/fixtures/unformatted.py
diff --git a/crates/ruff_cli/src/args.rs → crates/ruff/src/args.rs b/crates/ruff_cli/src/args.rs → crates/ruff/src/args.rs
diff --git a/crates/ruff_cli/src/cache.rs → crates/ruff/src/cache.rs b/crates/ruff_cli/src/cache.rs → crates/ruff/src/cache.rs
diff --git a/crates/ruff_cli/src/commands/add_noqa.rs → crates/ruff/src/commands/add_noqa.rs b/crates/ruff_cli/src/commands/add_noqa.rs → crates/ruff/src/commands/add_noqa.rs
diff --git a/crates/ruff_cli/src/commands/check.rs → crates/ruff/src/commands/check.rs b/crates/ruff_cli/src/commands/check.rs → crates/ruff/src/commands/check.rs
diff --git a/crates/ruff_cli/src/commands/check_stdin.rs → crates/ruff/src/commands/check_stdin.rs b/crates/ruff_cli/src/commands/check_stdin.rs → crates/ruff/src/commands/check_stdin.rs
diff --git a/crates/ruff_cli/src/commands/clean.rs → crates/ruff/src/commands/clean.rs b/crates/ruff_cli/src/commands/clean.rs → crates/ruff/src/commands/clean.rs
diff --git a/crates/ruff_cli/src/commands/config.rs → crates/ruff/src/commands/config.rs b/crates/ruff_cli/src/commands/config.rs → crates/ruff/src/commands/config.rs
diff --git a/crates/ruff_cli/src/commands/format.rs → crates/ruff/src/commands/format.rs b/crates/ruff_cli/src/commands/format.rs → crates/ruff/src/commands/format.rs
diff --git a/crates/ruff_cli/src/commands/format_stdin.rs → crates/ruff/src/commands/format_stdin.rs b/crates/ruff_cli/src/commands/format_stdin.rs → crates/ruff/src/commands/format_stdin.rs
diff --git a/crates/ruff_cli/src/commands/linter.rs → crates/ruff/src/commands/linter.rs b/crates/ruff_cli/src/commands/linter.rs → crates/ruff/src/commands/linter.rs
diff --git a/crates/ruff_cli/src/commands/mod.rs → crates/ruff/src/commands/mod.rs b/crates/ruff_cli/src/commands/mod.rs → crates/ruff/src/commands/mod.rs
diff --git a/crates/ruff_cli/src/commands/rule.rs → crates/ruff/src/commands/rule.rs b/crates/ruff_cli/src/commands/rule.rs → crates/ruff/src/commands/rule.rs
diff --git a/crates/ruff_cli/src/commands/show_files.rs → crates/ruff/src/commands/show_files.rs b/crates/ruff_cli/src/commands/show_files.rs → crates/ruff/src/commands/show_files.rs
diff --git a/...es/ruff_cli/src/commands/show_settings.rs → crates/ruff/src/commands/show_settings.rs b/...es/ruff_cli/src/commands/show_settings.rs → crates/ruff/src/commands/show_settings.rs
diff --git a/..._commands__check__test__E902_E902.py.snap → ..._commands__check__test__E902_E902.py.snap b/..._commands__check__test__E902_E902.py.snap → ..._commands__check__test__E902_E902.py.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff_cli/src/commands/check.rs
+source: crates/ruff/src/commands/check.rs
 ---
 /home/ferris/project/code.py:1:1: E902 Permission denied (os error 13)
 /home/ferris/project/notebook.ipynb:1:1: E902 Permission denied (os error 13)

diff --git a/crates/ruff_cli/src/commands/version.rs → crates/ruff/src/commands/version.rs b/crates/ruff_cli/src/commands/version.rs → crates/ruff/src/commands/version.rs
diff --git a/crates/ruff_cli/src/diagnostics.rs → crates/ruff/src/diagnostics.rs b/crates/ruff_cli/src/diagnostics.rs → crates/ruff/src/diagnostics.rs
diff --git a/crates/ruff_cli/src/lib.rs → crates/ruff/src/lib.rs b/crates/ruff_cli/src/lib.rs → crates/ruff/src/lib.rs
diff --git a/crates/ruff_cli/src/bin/ruff.rs → crates/ruff/src/main.rs b/crates/ruff_cli/src/bin/ruff.rs → crates/ruff/src/main.rs
@@ -3,8 +3,8 @@ use std::process::ExitCode;
 use clap::{Parser, Subcommand};
 use colored::Colorize;
 
-use ruff_cli::args::{Args, Command};
-use ruff_cli::{run, ExitStatus};
+use ruff::args::{Args, Command};
+use ruff::{run, ExitStatus};
 
 #[cfg(target_os = "windows")]
 #[global_allocator]

diff --git a/crates/ruff_cli/src/panic.rs → crates/ruff/src/panic.rs b/crates/ruff_cli/src/panic.rs → crates/ruff/src/panic.rs
diff --git a/crates/ruff_cli/src/printer.rs → crates/ruff/src/printer.rs b/crates/ruff_cli/src/printer.rs → crates/ruff/src/printer.rs
diff --git a/crates/ruff_cli/src/resolve.rs → crates/ruff/src/resolve.rs b/crates/ruff_cli/src/resolve.rs → crates/ruff/src/resolve.rs
diff --git a/crates/ruff/src/snapshots/ruff__version__tests__version_formatting.snap b/crates/ruff/src/snapshots/ruff__version__tests__version_formatting.snap
@@ -0,0 +1,5 @@
+---
+source: crates/ruff/src/version.rs
+expression: version
+---
+0.0.0
diff --git a/..._version_formatting_with_commit_info.snap → ..._version_formatting_with_commit_info.snap b/..._version_formatting_with_commit_info.snap → ..._version_formatting_with_commit_info.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff_cli/src/version.rs
+source: crates/ruff/src/version.rs
 expression: version
 ---
 0.0.0 (53b0f5d92 2023-10-19)
diff --git a/...rmatting_with_commits_since_last_tag.snap → ...rmatting_with_commits_since_last_tag.snap b/...rmatting_with_commits_since_last_tag.snap → ...rmatting_with_commits_since_last_tag.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff_cli/src/version.rs
+source: crates/ruff/src/version.rs
 expression: version
 ---
 0.0.0+24 (53b0f5d92 2023-10-19)
diff --git a/...version__tests__version_serializable.snap → ...version__tests__version_serializable.snap b/...version__tests__version_serializable.snap → ...version__tests__version_serializable.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff_cli/src/version.rs
+source: crates/ruff/src/version.rs
 expression: version
 ---
 {

diff --git a/crates/ruff_cli/src/stdin.rs → crates/ruff/src/stdin.rs b/crates/ruff_cli/src/stdin.rs → crates/ruff/src/stdin.rs
diff --git a/crates/ruff_cli/src/version.rs → crates/ruff/src/version.rs b/crates/ruff_cli/src/version.rs → crates/ruff/src/version.rs
diff --git a/crates/ruff_cli/tests/format.rs → crates/ruff/tests/format.rs b/crates/ruff_cli/tests/format.rs → crates/ruff/tests/format.rs
diff --git a/crates/ruff_cli/tests/integration_test.rs → crates/ruff/tests/integration_test.rs b/crates/ruff_cli/tests/integration_test.rs → crates/ruff/tests/integration_test.rs
@@ -20,9 +20,9 @@ use path_absolutize::path_dedot;
 use tempfile::TempDir;
 
 #[cfg(unix)]
-use ruff_cli::args::Args;
+use ruff::args::Args;
 #[cfg(unix)]
-use ruff_cli::run;
+use ruff::run;
 
 const BIN_NAME: &str = "ruff";
 

diff --git a/crates/ruff_cli/tests/lint.rs → crates/ruff/tests/lint.rs b/crates/ruff_cli/tests/lint.rs → crates/ruff/tests/lint.rs
diff --git a/crates/ruff_cli/tests/resolve_files.rs → crates/ruff/tests/resolve_files.rs b/crates/ruff_cli/tests/resolve_files.rs → crates/ruff/tests/resolve_files.rs
diff --git a/crates/ruff_cli/tests/show_settings.rs → crates/ruff/tests/show_settings.rs b/crates/ruff_cli/tests/show_settings.rs → crates/ruff/tests/show_settings.rs
diff --git a/...tion_test__explain_status_codes_f401.snap → ...tion_test__explain_status_codes_f401.snap b/...tion_test__explain_status_codes_f401.snap → ...tion_test__explain_status_codes_f401.snap
diff --git a/...apshots/integration_test__stdin_json.snap → ...apshots/integration_test__stdin_json.snap b/...apshots/integration_test__stdin_json.snap → ...apshots/integration_test__stdin_json.snap
diff --git a/...w_settings__display_default_settings.snap → ...w_settings__display_default_settings.snap b/...w_settings__display_default_settings.snap → ...w_settings__display_default_settings.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/ruff_cli/tests/show_settings.rs
+source: crates/ruff/tests/show_settings.rs
 info:
   program: ruff
   args:
@@ -10,7 +10,7 @@ info:
 success: true
 exit_code: 0
 ----- stdout -----
-Resolved settings for: "[BASEPATH]/crates/ruff_cli/resources/test/fixtures/unformatted.py"
+Resolved settings for: "[BASEPATH]/crates/ruff/resources/test/fixtures/unformatted.py"
 Settings path: "[BASEPATH]/pyproject.toml"
 
 # General Settings

diff --git a/crates/ruff_cli/src/snapshots/ruff_cli__version__tests__version_formatting.snap b/crates/ruff_cli/src/snapshots/ruff_cli__version__tests__version_formatting.snap
diff --git a/crates/ruff_dev/Cargo.toml b/crates/ruff_dev/Cargo.toml
@@ -11,14 +11,14 @@ repository = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
-ruff_linter = { path = "../ruff_linter", features = ["schemars"] }
-ruff_cli = { path = "../ruff_cli" }
+ruff = { path = "../ruff" }
 ruff_diagnostics = { path = "../ruff_diagnostics" }
 ruff_formatter = { path = "../ruff_formatter" }
+ruff_linter = { path = "../ruff_linter", features = ["schemars"] }
+ruff_notebook = { path = "../ruff_notebook" }
 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_parser = { path = "../ruff_python_parser" }
 ruff_python_stdlib = { path = "../ruff_python_stdlib" }
 ruff_python_trivia = { path = "../ruff_python_trivia" }

diff --git a/crates/ruff_dev/src/format_dev.rs b/crates/ruff_dev/src/format_dev.rs
@@ -27,8 +27,8 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::EnvFilter;
 
-use ruff_cli::args::{CliOverrides, FormatArguments, FormatCommand, LogLevelArgs};
-use ruff_cli::resolve::resolve;
+use ruff::args::{CliOverrides, FormatArguments, FormatCommand, LogLevelArgs};
+use ruff::resolve::resolve;
 use ruff_formatter::{FormatError, LineWidth, PrintError};
 use ruff_linter::logging::LogLevel;
 use ruff_linter::settings::types::{FilePattern, FilePatternSet};

diff --git a/crates/ruff_dev/src/generate_cli_help.rs b/crates/ruff_dev/src/generate_cli_help.rs
@@ -8,7 +8,7 @@ use anyhow::{bail, Context, Result};
 use clap::CommandFactory;
 use pretty_assertions::StrComparison;
 
-use ruff_cli::args;
+use ruff::args;
 
 use crate::generate_all::{Mode, REGENERATE_ALL_COMMAND};
 use crate::ROOT_DIR;

diff --git a/crates/ruff_dev/src/main.rs b/crates/ruff_dev/src/main.rs
@@ -4,7 +4,7 @@
 
 use anyhow::Result;
 use clap::{Parser, Subcommand};
-use ruff_cli::check;
+use ruff::check;
 use ruff_linter::logging::{set_up_logging, LogLevel};
 use std::process::ExitCode;
 
@@ -56,9 +56,9 @@ enum Command {
     /// Run a ruff command n times for profiling/benchmarking
     Repeat {
         #[clap(flatten)]
-        args: ruff_cli::args::CheckCommand,
+        args: ruff::args::CheckCommand,
         #[clap(flatten)]
-        log_level_args: ruff_cli::args::LogLevelArgs,
+        log_level_args: ruff::args::LogLevelArgs,
         /// Run this many times
         #[clap(long)]
         repeat: usize,