Update cargo-options to 0.7.1 (#1862)

Cargo.toml

@@ -40,7 +40,7 @@ base64 = "0.21.0"
 glob = "0.3.0"
 cargo-config2 = "0.1.9"
 cargo_metadata = "0.18.0"
-cargo-options = "0.6.0"
+cargo-options = "0.7.1"
 cbindgen = { version = "0.26.0", default-features = false }
 flate2 = "1.0.18"
 goblin = "0.7.1"
@@ -77,12 +77,12 @@ pep508_rs = { version = "0.2.1", features = ["serde"] }
 time = "0.3.17"
 
 # cli
-clap = { version = "4.0.0", features = ["derive", "env", "wrap_help"] }
+clap = { version = "4.0.0", features = ["derive", "env", "wrap_help", "unstable-styles"] }
 clap_complete_command = { version = "0.5.1", optional = true }
 
 # cross compile
-cargo-zigbuild = { version = "0.17.5", default-features = false, optional = true }
-cargo-xwin = { version = "0.15.0", default-features = false, optional = true }
+cargo-zigbuild = { version = "0.18.0", default-features = false, optional = true }
+cargo-xwin = { version = "0.16.0", default-features = false, optional = true }
 
 # log
 tracing = "0.1.36"
@@ -113,7 +113,7 @@ pretty_assertions = "1.3.0"
 rustversion = "1.0.9"
 time = { version = "0.3.17", features = ["macros"] }
 trycmd = "0.14.11"
-which = "4.3.0"
+which = "5.0.0"
 
 [features]
 default = ["full", "rustls"]

guide/src/develop.md

@@ -18,9 +18,6 @@ Options:
 
  [possible values: pyo3, pyo3-ffi, rust-cpython, cffi, uniffi, bin]
 
- -r, --release
- Pass --release to cargo
-
  --strip
  Strip the library for minimum file size
 
@@ -34,30 +31,46 @@ Options:
 
  Only works with mixed Rust/Python project layout
 
-  --pip-path <PIP_PATH>
-  Use a specific pip installation instead of the default one.
+ --pip-path <PIP_PATH>
+ Use a specific pip installation instead of the default one.
 
-  This can be used to supply the path to a pip executable when the current virtualenv does
-  not provide one.
+ This can be used to supply the path to a pip executable when the current virtualenv does
+ not provide one.
 
  -q, --quiet
  Do not print cargo log messages
 
+ --ignore-rust-version
+ Ignore `rust-version` specification in packages
+
+ -v, --verbose...
+ Use verbose output (-vv very verbose/build.rs output)
+
+ --color <WHEN>
+ Coloring: auto, always, never
+
+ --config <KEY=VALUE>
+ Override a configuration value (unstable)
+
+ -Z <FLAG>
+ Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details
+
+ --future-incompat-report
+ Outputs a future incompatibility report at the end of the build (unstable)
+
+ -h, --help
+ Print help (see a summary with '-h')
+
+Compilation Options:
+ -r, --release
+ Pass --release to cargo
+
  -j, --jobs <N>
  Number of parallel jobs, defaults to # of CPUs
 
  --profile <PROFILE-NAME>
  Build artifacts with the specified Cargo profile
 
- -F, --features <FEATURES>
- Space or comma separated list of features to activate
-
- --all-features
- Activate all available features
-
- --no-default-features
- Do not activate the `default` feature
-
  --target <TRIPLE>
  Build for the target triple
 
@@ -66,17 +79,22 @@ Options:
  --target-dir <DIRECTORY>
  Directory for all generated artifacts
 
- -m, --manifest-path <PATH>
- Path to Cargo.toml
+  --timings=<FMTS>
+ Timing output formats (unstable) (comma separated): html, json
 
- --ignore-rust-version
- Ignore `rust-version` specification in packages
+Feature Selection:
+ -F, --features <FEATURES>
+ Space or comma separated list of features to activate
 
- -v, --verbose...
- Use verbose output (-vv very verbose/build.rs output)
+  --all-features
+ Activate all available features
 
- --color <WHEN>
- Coloring: auto, always, never
+ --no-default-features
+ Do not activate the `default` feature
+
+Manifest Options:
+ -m, --manifest-path <PATH>
+ Path to Cargo.toml
 
  --frozen
  Require Cargo.lock and cache are up to date
@@ -86,21 +104,6 @@ Options:
 
  --offline
  Run without accessing the network
-
- --config <KEY=VALUE>
- Override a configuration value (unstable)
-
- -Z <FLAG>
- Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details
-
- --timings=<FMTS>
- Timing output formats (unstable) (comma separated): html, json
-
- --future-incompat-report
- Outputs a future incompatibility report at the end of the build (unstable)
-
- -h, --help
- Print help (see a summary with '-h')
 ```
 
 ## PEP 660 Editable Installs

guide/src/distribution.md

@@ -77,9 +77,6 @@ Arguments:
  Rustc flags
 
 Options:
- -r, --release
- Build artifacts in release mode, with optimizations
-
  --strip
  Strip the library for minimum file size
 
@@ -129,21 +126,37 @@ Options:
  -q, --quiet
  Do not print cargo log messages
 
+ --ignore-rust-version
+ Ignore `rust-version` specification in packages
+
+ -v, --verbose...
+ Use verbose output (-vv very verbose/build.rs output)
+
+ --color <WHEN>
+ Coloring: auto, always, never
+
+ --config <KEY=VALUE>
+ Override a configuration value (unstable)
+
+ -Z <FLAG>
+ Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details
+
+ --future-incompat-report
+ Outputs a future incompatibility report at the end of the build (unstable)
+
+ -h, --help
+ Print help (see a summary with '-h')
+
+Compilation Options:
+ -r, --release
+ Build artifacts in release mode, with optimizations
+
  -j, --jobs <N>
  Number of parallel jobs, defaults to # of CPUs
 
  --profile <PROFILE-NAME>
  Build artifacts with the specified Cargo profile
 
- -F, --features <FEATURES>
- Space or comma separated list of features to activate
-
- --all-features
- Activate all available features
-
- --no-default-features
- Do not activate the `default` feature
-
  --target <TRIPLE>
  Build for the target triple
 
@@ -152,17 +165,22 @@ Options:
  --target-dir <DIRECTORY>
  Directory for all generated artifacts
 
- -m, --manifest-path <PATH>
- Path to Cargo.toml
+  --timings=<FMTS>
+ Timing output formats (unstable) (comma separated): html, json
 
- --ignore-rust-version
- Ignore `rust-version` specification in packages
+Feature Selection:
+ -F, --features <FEATURES>
+ Space or comma separated list of features to activate
 
- -v, --verbose...
- Use verbose output (-vv very verbose/build.rs output)
+  --all-features
+ Activate all available features
 
- --color <WHEN>
- Coloring: auto, always, never
+ --no-default-features
+ Do not activate the `default` feature
+
+Manifest Options:
+ -m, --manifest-path <PATH>
+ Path to Cargo.toml
 
  --frozen
  Require Cargo.lock and cache are up to date
@@ -172,21 +190,6 @@ Options:
 
  --offline
  Run without accessing the network
-
- --config <KEY=VALUE>
- Override a configuration value (unstable)
-
- -Z <FLAG>
- Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details
-
- --timings=<FMTS>
- Timing output formats (unstable) (comma separated): html, json
-
- --future-incompat-report
- Outputs a future incompatibility report at the end of the build (unstable)
-
- -h, --help
- Print help (see a summary with '-h')
 ```
 
 ### Cross Compiling