Rollup merge of #134420 - Integral-Tech:pathbuf-refactor, r=compiler-errors

refactor: replace &PathBuf with &Path to enhance generality

- According to [style.md](https://github.com/rust-lang/rust/blob/master/src/tools/rust-analyzer/docs/dev/style.md#useless-types):

> More generally, always prefer types on the left
```rust
// GOOD      BAD
&[T]         &Vec<T>
&str         &String
Option<&T>   &Option<T>
&Path        &PathBuf
```
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-12-18 22:56:56 +08:00 committed by GitHub
commit 099faa8beb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 15 additions and 18 deletions

View file

@ -1,6 +1,6 @@
use std::env;
use std::ffi::OsString;
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use std::process::Command;
use std::sync::Arc;
@ -141,7 +141,7 @@ pub(crate) fn extract_cdb_version(full_version_line: &str) -> Option<[u16; 4]> {
pub(crate) fn analyze_gdb(
gdb: Option<String>,
target: &str,
android_cross_path: &PathBuf,
android_cross_path: &Path,
) -> (Option<String>, Option<u32>) {
#[cfg(not(windows))]
const GDB_FALLBACK: &str = "gdb";

View file

@ -598,10 +598,9 @@ pub fn collect_and_make_tests(config: Arc<Config>) -> Vec<test::TestDescAndFn> {
let mut collector =
TestCollector { tests: vec![], found_path_stems: HashSet::new(), poisoned: false };
collect_tests_from_dir(&cx, &mut collector, &cx.config.src_base, &PathBuf::new())
.unwrap_or_else(|reason| {
panic!("Could not read tests from {}: {reason}", cx.config.src_base.display())
});
collect_tests_from_dir(&cx, &mut collector, &cx.config.src_base, Path::new("")).unwrap_or_else(
|reason| panic!("Could not read tests from {}: {reason}", cx.config.src_base.display()),
);
let TestCollector { tests, found_path_stems, poisoned } = collector;

View file

@ -2560,7 +2560,7 @@ impl<'test> TestCx<'test> {
})
}
fn delete_file(&self, file: &PathBuf) {
fn delete_file(&self, file: &Path) {
if !file.exists() {
// Deleting a nonexistent file would error.
return;

View file

@ -163,7 +163,7 @@ fn apply_shared_opts(cmd: &mut Command, opts: &SharedOpts) {
}
}
fn execute_benchmark(cmd: &mut Command, compiler: &PathBuf) {
fn execute_benchmark(cmd: &mut Command, compiler: &Path) {
cmd.arg(compiler);
println!("Running `rustc-perf` using `{}`", compiler.display());