Skip to content

Commit 01554a5

Browse files
committed
chore(clippy): fix new clippy errors
1 parent b9728f4 commit 01554a5

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fn find_php() -> Result<PathBuf> {
7474
if let Some(path) = path_from_env("PHP") {
7575
if !path.try_exists()? {
7676
// If path was explicitly given and it can't be found, this is a hard error
77-
bail!("php executable not found at {:?}", path);
77+
bail!("php executable not found at {}", path.display());
7878
}
7979
return Ok(path);
8080
}

crates/cli/src/lib.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,15 +269,15 @@ fn get_ext_dir() -> AResult<PathBuf> {
269269
.output()
270270
.context("Failed to call PHP")?;
271271
if !cmd.status.success() {
272-
bail!("Failed to call PHP: {:?}", cmd);
272+
bail!("Failed to call PHP: {cmd:?}");
273273
}
274274
let stdout = String::from_utf8_lossy(&cmd.stdout);
275275
let ext_dir = PathBuf::from(stdout.rsplit('\n').next().unwrap());
276276
if !ext_dir.is_dir() {
277277
if ext_dir.exists() {
278278
bail!(
279-
"Extension directory returned from PHP is not a valid directory: {:?}",
280-
ext_dir
279+
"Extension directory returned from PHP is not a valid directory: {}",
280+
ext_dir.display()
281281
);
282282
}
283283

@@ -299,14 +299,14 @@ fn get_php_ini() -> AResult<PathBuf> {
299299
.output()
300300
.context("Failed to call PHP")?;
301301
if !cmd.status.success() {
302-
bail!("Failed to call PHP: {:?}", cmd);
302+
bail!("Failed to call PHP: {cmd:?}");
303303
}
304304
let stdout = String::from_utf8_lossy(&cmd.stdout);
305305
let ini = PathBuf::from(stdout.rsplit('\n').next().unwrap());
306306
if !ini.is_file() {
307307
bail!(
308-
"php.ini does not exist or is not a file at the given path: {:?}",
309-
ini
308+
"php.ini does not exist or is not a file at the given path: {}",
309+
ini.display()
310310
);
311311
}
312312
Ok(ini)
@@ -416,7 +416,7 @@ impl Stubs {
416416
})?;
417417

418418
if !cli_version.matches(&ext_version) {
419-
bail!("Extension was compiled with an incompatible version of `ext-php-rs` - Extension: {}, CLI: {}", ext_version, cli_version);
419+
bail!("Extension was compiled with an incompatible version of `ext-php-rs` - Extension: {ext_version}, CLI: {cli_version}");
420420
}
421421

422422
let stubs = result

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unix_build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl Provider<'_> {
1818
let stdout = String::from_utf8_lossy(&cmd.stdout);
1919
if !cmd.status.success() {
2020
let stderr = String::from_utf8_lossy(&cmd.stderr);
21-
bail!("Failed to run `php-config`: {} {}", stdout, stderr);
21+
bail!("Failed to run `php-config`: {stdout} {stderr}");
2222
}
2323
Ok(stdout.to_string())
2424
}
@@ -28,7 +28,7 @@ impl Provider<'_> {
2828
if let Some(path) = path_from_env("PHP_CONFIG") {
2929
if !path.try_exists()? {
3030
// If path was explicitly given and it can't be found, this is a hard error
31-
bail!("php-config executable not found at {:?}", path);
31+
bail!("php-config executable not found at {}", path.display());
3232
}
3333
return Ok(path);
3434
}

0 commit comments

Comments
 (0)