cc - cargo Package Compare versions

Comparing version 1.2.14 to 1.2.15

.cargo_vcs_info.json

 {
   "git": {
-    "sha1": "328d0ff09a3c4cb3e1f32771ea9ea8ea23de1385"
+    "sha1": "9731605fb9b8a2a8188bf410002dfa0a096d7784"
   },
   "path_in_vcs": ""
 }

Cargo.lock

@@ -13,3 +13,3 @@ # This file is automatically @generated by Cargo.
 name = "cc"
-version = "1.2.14"
+version = "1.2.15"
 dependencies = [
@@ -104,5 +104,5 @@ "jobserver",
 name = "tempfile"
-version = "3.16.0"
+version = "3.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
 dependencies = [
@@ -109,0 +109,0 @@ "cfg-if",

Cargo.toml

@@ -16,3 +16,3 @@ # THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
 name = "cc"
-version = "1.2.14"
+version = "1.2.15"
 authors = ["Alex Crichton <[e-mail]>"]
@@ -43,2 +43,9 @@ build = false
 
+[features]
+jobserver = []
+parallel = [
+    "dep:libc",
+    "dep:jobserver",
+]
+
 [lib]
@@ -59,9 +66,2 @@ name = "cc"
 
-[features]
-jobserver = []
-parallel = [
-    "dep:libc",
-    "dep:jobserver",
-]
-
 [target."cfg(unix)".dependencies.libc]
@@ -68,0 +68,0 @@ version = "0.2.62"

CHANGELOG.md

@@ -9,2 +9,10 @@ # Changelog
 
+## [1.2.15](https://github.com/rust-lang/cc-rs/compare/cc-v1.2.14...cc-v1.2.15) - 2025-02-21
+
+### Other
+
+- Regenerate target info ([#1406](https://github.com/rust-lang/cc-rs/pull/1406))
+- Always read from all `CFLAGS`-style flags ([#1401](https://github.com/rust-lang/cc-rs/pull/1401))
+- Simplify the error output on failed `Command` invocation ([#1397](https://github.com/rust-lang/cc-rs/pull/1397))
+
 ## [1.2.14](https://github.com/rust-lang/cc-rs/compare/cc-v1.2.13...cc-v1.2.14) - 2025-02-14
@@ -11,0 +19,0 @@

src/command_helpers.rs

@@ -250,3 +250,2 @@ //! Miscellaneous helpers for running commands
     cmd: &Command,
-    program: &Path,
     child: &mut Child,
@@ -262,8 +261,3 @@ cargo_output: &CargoOutput,
                 ErrorKind::ToolExecError,
-                format!(
-                    "Failed to wait on spawned child process, command {:?} with args {}: {}.",
-                    cmd,
-                    program.display(),
-                    e
-                ),
+                format!("failed to wait on spawned child process `{cmd:?}`: {e}"),
             ));
@@ -280,8 +274,3 @@ }
             ErrorKind::ToolExecError,
-            format!(
-                "Command {:?} with args {} did not execute successfully (status code {}).",
-                cmd,
-                program.display(),
-                status
-            ),
+            format!("command did not execute successfully (status code {status}): {cmd:?}"),
         ))
@@ -356,24 +345,12 @@ }
 
-pub(crate) fn run(
-    cmd: &mut Command,
-    program: impl AsRef<Path>,
-    cargo_output: &CargoOutput,
-) -> Result<(), Error> {
-    let program = program.as_ref();
-
-    let mut child = spawn(cmd, program, cargo_output)?;
-    wait_on_child(cmd, program, &mut child, cargo_output)
+pub(crate) fn run(cmd: &mut Command, cargo_output: &CargoOutput) -> Result<(), Error> {
+    let mut child = spawn(cmd, cargo_output)?;
+    wait_on_child(cmd, &mut child, cargo_output)
 }
 
-pub(crate) fn run_output(
-    cmd: &mut Command,
-    program: impl AsRef<Path>,
-    cargo_output: &CargoOutput,
-) -> Result<Vec<u8>, Error> {
-    let program = program.as_ref();
-
+pub(crate) fn run_output(cmd: &mut Command, cargo_output: &CargoOutput) -> Result<Vec<u8>, Error> {
     // We specifically need the output to be captured, so override default
     let mut captured_cargo_output = cargo_output.clone();
     captured_cargo_output.output = OutputKind::Capture;
-    let mut child = spawn(cmd, program, &captured_cargo_output)?;
+    let mut child = spawn(cmd, &captured_cargo_output)?;
 
@@ -389,3 +366,3 @@ let mut stdout = vec![];
     // Don't care about this output, use the normal settings
-    wait_on_child(cmd, program, &mut child, cargo_output)?;
+    wait_on_child(cmd, &mut child, cargo_output)?;
 
@@ -395,7 +372,3 @@ Ok(stdout)
 
-pub(crate) fn spawn(
-    cmd: &mut Command,
-    program: &Path,
-    cargo_output: &CargoOutput,
-) -> Result<Child, Error> {
+pub(crate) fn spawn(cmd: &mut Command, cargo_output: &CargoOutput) -> Result<Child, Error> {
     struct ResetStderr<'cmd>(&'cmd mut Command);
@@ -423,4 +396,3 @@
             let extra = if cfg!(windows) {
-                " (see https://docs.rs/cc/latest/cc/#compile-time-requirements \
-for help)"
+                " (see https://docs.rs/cc/latest/cc/#compile-time-requirements for help)"
             } else {
@@ -431,7 +403,3 @@ ""
                 ErrorKind::ToolNotFound,
-                format!(
-                    "Failed to find tool. Is `{}` installed?{}",
-                    program.display(),
-                    extra
-                ),
+                format!("failed to find tool {:?}: {e}{extra}", cmd.0.get_program()),
             ))
@@ -441,8 +409,3 @@ }
             ErrorKind::ToolExecError,
-            format!(
-                "Command {:?} with args {} failed to start: {:?}",
-                cmd.0,
-                program.display(),
-                e
-            ),
+            format!("command `{:?}` failed to start: {e}", cmd.0),
         )),
@@ -477,3 +440,2 @@ }
     cmd: &Command,
-    program: &Path,
     child: &mut Child,
@@ -496,8 +458,3 @@ stdout: &mut dyn io::Write,
                     ErrorKind::ToolExecError,
-                    format!(
-                        "Command {:?} with args {} did not execute successfully (status code {}).",
-                        cmd,
-                        program.display(),
-                        status
-                    ),
+                    format!("command did not execute successfully (status code {status}): {cmd:?}"),
                 ))
@@ -511,8 +468,3 @@ }
                 ErrorKind::ToolExecError,
-                format!(
-                    "Failed to wait on spawned child process, command {:?} with args {}: {}.",
-                    cmd,
-                    program.display(),
-                    e
-                ),
+                format!("failed to wait on spawned child process `{cmd:?}`: {e}"),
             ))
@@ -519,0 +471,0 @@ }

src/tool.rs

@@ -102,3 +102,2 @@ use std::{
                 Command::new(path).arg("--version"),
-                path,
                 // tool detection issues should always be shown as warnings
@@ -129,3 +128,2 @@ cargo_output,
                 Command::new(path).args(args).arg("-?").stdin(Stdio::null()),
-                path,
                 &{
@@ -207,3 +205,2 @@ // the errors are not errors!
                 Command::new(path).arg("-E").arg(tmp.path()),
-                path,
                 &compiler_detect_output,
@@ -216,3 +213,2 @@ )?;
                     Command::new(path).arg("-E").arg("--").arg(tmp.path()),
-                    path,
                     &compiler_detect_output,
@@ -219,0 +215,0 @@ )?;

No alert changes

No metric changes