Skip to content

Remove cargo dev fmt reliance on rustup #13759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Remove cargo dev fmt reliance on rustup #13759

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2667f4a
Remove cargo dev fmt reliance on rustup
DylanBulfin Nov 29, 2024
f3dbae6
Change cargo dev fmt fallback
DylanBulfin Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions clippy_dev/src/fmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,16 +307,19 @@ fn run_rustfmt(context: &FmtContext) -> Result<(), Error> {

// the "main" function of cargo dev fmt
pub fn run(check: bool, verbose: bool) {
let output = Command::new("rustup")
let result = Command::new("rustup")
.args(["which", "rustfmt"])
.stderr(Stdio::inherit())
.output()
.expect("error running `rustup which rustfmt`");
if !output.status.success() {
eprintln!("`rustup which rustfmt` did not execute successfully");
process::exit(1);
}
let mut rustfmt_path = String::from_utf8(output.stdout).expect("invalid rustfmt path");
.output();

let mut rustfmt_path = if let Ok(output) = result
&& output.status.success()
{
String::from_utf8(output.stdout).expect("invalid rustfmt path")
} else {
String::from("rustfmt")
};

rustfmt_path.truncate(rustfmt_path.trim_end().len());

let context = FmtContext {
Expand Down