Bump MSRV to 1.70

.github/workflows/CI.yml

@@ -32,12 +32,12 @@ jobs:
       fail-fast: ${{ !contains(github.event.pull_request.labels.*.name, 'CI-no-fail-fast') }}
       matrix:
         os: [ubuntu-latest, macos-13, windows-latest]
-        toolchain: [1.67.0, stable, nightly]
+        toolchain: [1.70.0, stable, nightly]
         # Ideally we should also test against 0.9.0, but it is too unusable to test from CI
         zig: [0.10.1, 0.11.0, master]
         exclude:
           # Only test MSRV with zig stable version
-          - toolchain: 1.67.0
+          - toolchain: 1.70.0
             zig: master
     env:
       RUST_BACKTRACE: "1"

Cargo.toml

@@ -7,7 +7,7 @@ license = "MIT"
 keywords = ["zig", "cargo"]
 readme = "README.md"
 repository = "https://github.com/rust-cross/cargo-zigbuild"
-rust-version = "1.67"
+rust-version = "1.70"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -26,7 +26,7 @@ serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.79"
 shlex = "1"
 target-lexicon = { version = "0.12.5", features = ["std"] }
-which = "5.0.0"
+which = "6.0.0"
 
 [features]
 default = ["universal2"]

src/zig.rs

@@ -513,7 +513,7 @@ impl Zig {
                     options.push("-DTARGET_OS_IPHONE=0".to_string());
                 }
 
-                let escaped_options = shlex::join(options.iter().map(|s| &s[..]));
+                let escaped_options = shlex::try_join(options.iter().map(|s| &s[..]))?;
 
                 // Override bindgen variables to append additional options
                 let bindgen_env = "BINDGEN_EXTRA_CLANG_ARGS";
@@ -523,7 +523,7 @@ impl Zig {
                     if let Ok(mut value) = env::var(&name).or(fallback_value.clone()) {
                         if shlex::split(&value).is_none() {
                             // bindgen treats the whole string as a single argument if split fails
-                            value = shlex::quote(&value).into_owned();
+                            value = shlex::try_quote(&value)?.into_owned();
                         }
                         if !value.is_empty() {
                             value.push(' ');