rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use rustfmt version from rust-toolchain

Browse Source
This commit is contained in:
Jason Newcomb
2021-11-11 21:14:40 -05:00
parent 8b84a760ca
commit 24d561f008
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clippy_dev/src/fmt.rs
View File

@@ -149,7 +149,7 @@ fn exec(
} }
fn cargo_fmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> { fn cargo_fmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> {
let mut args = vec!["+nightly", "fmt", "--all"]; let mut args = vec!["fmt", "--all"];
if context.check { if context.check {
args.push("--"); args.push("--");
args.push("--check"); args.push("--check");
@@ -162,7 +162,7 @@ fn cargo_fmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> {
fn rustfmt_test(context: &FmtContext) -> Result<(), CliError> { fn rustfmt_test(context: &FmtContext) -> Result<(), CliError> {
let program = "rustfmt"; let program = "rustfmt";
let dir = std::env::current_dir()?; let dir = std::env::current_dir()?;
let args = &["+nightly", "--version"]; let args = &["--version"];
if context.verbose { if context.verbose {
println!("{}", format_command(&program, &dir, args)); println!("{}", format_command(&program, &dir, args));
@@ -186,7 +186,7 @@ fn rustfmt_test(context: &FmtContext) -> Result<(), CliError> {
} }
fn rustfmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> { fn rustfmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> {
let mut args = vec!["+nightly".as_ref(), path.as_os_str()]; let mut args = vec![path.as_os_str()];
if context.check { if context.check {
args.push("--check".as_ref()); args.push("--check".as_ref());
} }