language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-02 22:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactor ruff_cli's run method to return on each branch (#7040)

Browse source 
## Summary

I think the fallthrough here for some branches is a little confusing.
Now each branch either runs a command that returns `Result<ExitStatus>`,
or runs a command that returns `Result<()>` and then explicitly returns
`Ok(ExitStatus::SUCCESS)`.
This commit is contained in:
Charlie Marsh 2023-09-01 14:15:38 +01:00 • committed by GitHub
parent 0489bbc54c
commit 08e246764f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/ruff_cli/src/lib.rs
View file

@ -139,18 +139,27 @@ quoting the executed command, along with the relevant file contents and `pyproje
if let Some(rule) = rule {
commands::rule::rule(rule, format)?;
}
Ok(ExitStatus::Success)
}
Command::Config { option } => {
commands::config::config(option.as_deref())?;
Ok(ExitStatus::Success)
}
Command::Linter { format } => {
commands::linter::linter(format)?;
Ok(ExitStatus::Success)
}
Command::Clean => {
commands::clean::clean(log_level)?;
Ok(ExitStatus::Success)
}
Command::Config { option } => return Ok(commands::config::config(option.as_deref())),
Command::Linter { format } => commands::linter::linter(format)?,
Command::Clean => commands::clean::clean(log_level)?,
Command::GenerateShellCompletion { shell } => {
shell.generate(&mut Args::command(), &mut stdout());
Ok(ExitStatus::Success)
}
Command::Check(args) => return check(args, log_level),
Command::Format(args) => return format(args, log_level),
Command::Check(args) => check(args, log_level),
Command::Format(args) => format(args, log_level),
}
Ok(ExitStatus::Success)
}
fn format(args: FormatCommand, log_level: LogLevel) -> Result<ExitStatus> {