diff --git a/src/tools/rustfmt/src/cargo-fmt/main.rs b/src/tools/rustfmt/src/cargo-fmt/main.rs index eedb43defb90c..2987fa8d0bddc 100644 --- a/src/tools/rustfmt/src/cargo-fmt/main.rs +++ b/src/tools/rustfmt/src/cargo-fmt/main.rs @@ -6,7 +6,6 @@ use std::cmp::Ordering; use std::collections::{BTreeMap, BTreeSet}; use std::env; -use std::ffi::OsStr; use std::fs; use std::hash::{Hash, Hasher}; use std::io::{self, Write}; @@ -151,11 +150,10 @@ fn execute() -> i32 { } fn rustfmt_command() -> Command { - let rustfmt_var = env::var_os("RUSTFMT"); - let rustfmt = match &rustfmt_var { - Some(rustfmt) => rustfmt, - None => OsStr::new("rustfmt"), - }; + let rustfmt = env::current_exe() + .expect("current executable path invalid") + .with_file_name("rustfmt"); + Command::new(rustfmt) }