mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-28 19:27:30 +03:00
8d2912ec00
Fix false-positive of redundant_clone and move to clippy::perf This PR introduces dataflow analysis to `redundant_clone` lint to filter out borrowed variables, which had been incorrectly detected. Depends on https://github.com/rust-lang/rust/pull/64207. changelog: Moved `redundant_clone` lint to `perf` group # What this lint catches ## `clone`/`to_owned` ```rust let s = String::new(); let t = s.clone(); ``` ```rust // MIR _1 = String::new(); _2 = &_1; _3 = clone(_2); // (*) ``` We can turn this `clone` call into a move if 1. `_2` is the sole borrow of `_1` at the statement `(*)` 2. `_1` is not used hereafter ## `Deref` + type-specific `to_owned` method ```rust let s = std::path::PathBuf::new(); let t = s.to_path_buf(); ``` ```rust // MIR _1 = PathBuf::new(); _2 = &1; _3 = call deref(_2); _4 = _3; // Copies borrow StorageDead(_2); _5 = Path::to_path_buf(_4); // (*) ``` We can turn this `to_path_buf` call into a move if 1. `_3` `_4` are the sole borrow of `_1` at `(*)` 2. `_1` is not used hereafter # What this PR introduces 1. `MaybeStorageLive` that determines whether a local lives at a particular location 2. `PossibleBorrowerVisitor` that constructs [`TransitiveRelation`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_data_structures/transitive_relation/struct.TransitiveRelation.html) of possible borrows, e.g. visiting `_2 = &1; _3 = &_2:` will result in `_3 -> _2 -> _1` relation. Then `_3` and `_2` will be counted as possible borrowers of `_1` in the sole-borrow analysis above.
207 lines
5.8 KiB
Rust
207 lines
5.8 KiB
Rust
use shell_escape::escape;
|
|
use std::ffi::OsStr;
|
|
use std::io;
|
|
use std::path::{Path, PathBuf};
|
|
use std::process::{self, Command};
|
|
use walkdir::WalkDir;
|
|
|
|
#[derive(Debug)]
|
|
pub enum CliError {
|
|
CommandFailed(String),
|
|
IoError(io::Error),
|
|
ProjectRootNotFound,
|
|
RustfmtNotInstalled,
|
|
WalkDirError(walkdir::Error),
|
|
}
|
|
|
|
impl From<io::Error> for CliError {
|
|
fn from(error: io::Error) -> Self {
|
|
Self::IoError(error)
|
|
}
|
|
}
|
|
|
|
impl From<walkdir::Error> for CliError {
|
|
fn from(error: walkdir::Error) -> Self {
|
|
Self::WalkDirError(error)
|
|
}
|
|
}
|
|
|
|
struct FmtContext {
|
|
check: bool,
|
|
verbose: bool,
|
|
}
|
|
|
|
pub fn run(check: bool, verbose: bool) {
|
|
fn try_run(context: &FmtContext) -> Result<bool, CliError> {
|
|
let mut success = true;
|
|
|
|
let project_root = project_root()?;
|
|
|
|
rustfmt_test(context)?;
|
|
|
|
success &= cargo_fmt(context, project_root.as_path())?;
|
|
success &= cargo_fmt(context, &project_root.join("clippy_dev"))?;
|
|
success &= cargo_fmt(context, &project_root.join("rustc_tools_util"))?;
|
|
|
|
for entry in WalkDir::new(project_root.join("tests")) {
|
|
let entry = entry?;
|
|
let path = entry.path();
|
|
|
|
if path.extension() != Some("rs".as_ref())
|
|
|| entry.file_name() == "ice-3891.rs"
|
|
// Avoid rustfmt bug rust-lang/rustfmt#1873
|
|
|| cfg!(windows) && entry.file_name() == "implicit_hasher.rs"
|
|
{
|
|
continue;
|
|
}
|
|
|
|
success &= rustfmt(context, &path)?;
|
|
}
|
|
|
|
Ok(success)
|
|
}
|
|
|
|
fn output_err(err: CliError) {
|
|
match err {
|
|
CliError::CommandFailed(command) => {
|
|
eprintln!("error: A command failed! `{}`", command);
|
|
},
|
|
CliError::IoError(err) => {
|
|
eprintln!("error: {}", err);
|
|
},
|
|
CliError::ProjectRootNotFound => {
|
|
eprintln!("error: Can't determine root of project. Please run inside a Clippy working dir.");
|
|
},
|
|
CliError::RustfmtNotInstalled => {
|
|
eprintln!("error: rustfmt nightly is not installed.");
|
|
},
|
|
CliError::WalkDirError(err) => {
|
|
eprintln!("error: {}", err);
|
|
},
|
|
}
|
|
}
|
|
|
|
let context = FmtContext { check, verbose };
|
|
let result = try_run(&context);
|
|
let code = match result {
|
|
Ok(true) => 0,
|
|
Ok(false) => {
|
|
eprintln!();
|
|
eprintln!("Formatting check failed.");
|
|
eprintln!("Run `./util/dev fmt` to update formatting.");
|
|
1
|
|
},
|
|
Err(err) => {
|
|
output_err(err);
|
|
1
|
|
},
|
|
};
|
|
process::exit(code);
|
|
}
|
|
|
|
fn format_command(program: impl AsRef<OsStr>, dir: impl AsRef<Path>, args: &[impl AsRef<OsStr>]) -> String {
|
|
let arg_display: Vec<_> = args.iter().map(|a| escape(a.as_ref().to_string_lossy())).collect();
|
|
|
|
format!(
|
|
"cd {} && {} {}",
|
|
escape(dir.as_ref().to_string_lossy()),
|
|
escape(program.as_ref().to_string_lossy()),
|
|
arg_display.join(" ")
|
|
)
|
|
}
|
|
|
|
fn exec(
|
|
context: &FmtContext,
|
|
program: impl AsRef<OsStr>,
|
|
dir: impl AsRef<Path>,
|
|
args: &[impl AsRef<OsStr>],
|
|
) -> Result<bool, CliError> {
|
|
if context.verbose {
|
|
println!("{}", format_command(&program, &dir, args));
|
|
}
|
|
|
|
let mut child = Command::new(&program).current_dir(&dir).args(args.iter()).spawn()?;
|
|
let code = child.wait()?;
|
|
let success = code.success();
|
|
|
|
if !context.check && !success {
|
|
return Err(CliError::CommandFailed(format_command(&program, &dir, args)));
|
|
}
|
|
|
|
Ok(success)
|
|
}
|
|
|
|
fn cargo_fmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> {
|
|
let mut args = vec!["+nightly", "fmt", "--all"];
|
|
if context.check {
|
|
args.push("--");
|
|
args.push("--check");
|
|
}
|
|
let success = exec(context, &bin_path("cargo"), path, &args)?;
|
|
|
|
Ok(success)
|
|
}
|
|
|
|
fn rustfmt_test(context: &FmtContext) -> Result<(), CliError> {
|
|
let program = bin_path("rustfmt");
|
|
let dir = std::env::current_dir()?;
|
|
let args = &["+nightly", "--version"];
|
|
|
|
if context.verbose {
|
|
println!("{}", format_command(&program, &dir, args));
|
|
}
|
|
|
|
let output = Command::new(&program).current_dir(&dir).args(args.iter()).output()?;
|
|
|
|
if output.status.success() {
|
|
Ok(())
|
|
} else if std::str::from_utf8(&output.stderr)
|
|
.unwrap_or("")
|
|
.starts_with("error: 'rustfmt' is not installed")
|
|
{
|
|
Err(CliError::RustfmtNotInstalled)
|
|
} else {
|
|
Err(CliError::CommandFailed(format_command(&program, &dir, args)))
|
|
}
|
|
}
|
|
|
|
fn rustfmt(context: &FmtContext, path: &Path) -> Result<bool, CliError> {
|
|
let mut args = vec!["+nightly".as_ref(), path.as_os_str()];
|
|
if context.check {
|
|
args.push("--check".as_ref());
|
|
}
|
|
let success = exec(context, &bin_path("rustfmt"), std::env::current_dir()?, &args)?;
|
|
if !success {
|
|
eprintln!("rustfmt failed on {}", path.display());
|
|
}
|
|
Ok(success)
|
|
}
|
|
|
|
fn project_root() -> Result<PathBuf, CliError> {
|
|
let current_dir = std::env::current_dir()?;
|
|
for path in current_dir.ancestors() {
|
|
let result = std::fs::read_to_string(path.join("Cargo.toml"));
|
|
if let Err(err) = &result {
|
|
if err.kind() == io::ErrorKind::NotFound {
|
|
continue;
|
|
}
|
|
}
|
|
|
|
let content = result?;
|
|
if content.contains("[package]\nname = \"clippy\"") {
|
|
return Ok(path.to_path_buf());
|
|
}
|
|
}
|
|
|
|
Err(CliError::ProjectRootNotFound)
|
|
}
|
|
|
|
// Workaround for https://github.com/rust-lang/cargo/issues/7475.
|
|
// FIXME: replace `&bin_path("command")` with `"command"` once the issue is fixed
|
|
fn bin_path(bin: &str) -> String {
|
|
let mut p = home::cargo_home().unwrap();
|
|
p.push("bin");
|
|
p.push(bin);
|
|
p.display().to_string()
|
|
}
|