Stabilize config-cli #10755

jonhoo · 2022-06-13T21:57:32Z

This stabilizes the --config CLI argument as per this FCP.

It also makes the adjustment suggested by @ehuss to allow stabilizing --config path without also stabilizing config-include.

I took a guess that this would land in 1.63 and put that in the tombstone entry in the unstable docs, but let me know if that's likely to be wrong.

Closes #7722.

Also, I think this should probably be tagged relnotes.

rust-highfive · 2022-06-13T21:57:37Z

r? @ehuss

(rust-highfive has picked a reviewer for you, use r? to override)

jonhoo · 2022-06-13T22:05:36Z

The CI failures appear to be new deprecations in clap that are being treated as errors? I assume that's fixed by #10753 @epage?

epage · 2022-06-13T23:50:41Z

There is also #10742 which would help with it.

epage · 2022-06-14T16:30:21Z

clap 3.2.3 disables the deprecations by default and people can enable them with the deprecated feature.

In theory, this should unblock CI so I re-kicked off the jobs.

jonhoo · 2022-06-14T16:51:38Z

Hmm, the new test failure appears to be related to the clap update changing a help message somewhere @epage?

jonhoo · 2022-06-15T00:16:21Z

I force-pushed to build on top of the landed 3.2 upgrade.

bors · 2022-06-17T17:29:30Z

☔ The latest upstream changes (presumably #10764) made this pull request unmergeable. Please resolve the merge conflicts.

As per rust-lang#7722 (comment)

FCP rust-lang#7722 (comment) Closes rust-lang#7722.

jonhoo · 2022-06-17T22:46:40Z

Fixed conflict (which was just a trailing newline to unstable.md) by force-push.

jonhoo · 2022-06-20T18:25:03Z

@ehuss gentle bump on this — would be nice to land it for 1.63 beta.

weihanglo

Ah, here might need an update as well.

cargo/src/bin/cargo/cli.rs

Lines 480 to 484 in c9d8c28

    
           multi_opt( 
        
               "config", 
        
               "KEY=VALUE", 
        
               "Override a configuration value (unstable)", 
        
           )

Also, should we add --config to cargo help <cmd> manpage-like help? I am not sure where it should be located. Common Options or Miscellaneous Options or else?

jonhoo · 2022-06-21T16:25:08Z

@weihanglo That makes sense! I've addressed both of those — hopefully in a good way.

weihanglo

Looks nice to me. Thanks!

ehuss · 2022-06-22T20:02:16Z

Thanks!

@bors r+

bors · 2022-06-22T20:02:20Z

📌 Commit 7eefb42 has been approved by ehuss

bors · 2022-06-22T20:02:27Z

⌛ Testing commit 7eefb42 with merge ed549d8...

bors · 2022-06-22T20:51:21Z

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing ed549d8 to master...

jonhoo · 2022-06-22T20:56:06Z

@weihanglo Can you tag this with relnotes?

8 commits in 03a849043e25104e8b7ad0d4a96c525787b69379..a5e08c4703f202e30cdaf80ca3e7c00baa59c496 2022-06-20 14:47:36 +0000 to 2022-06-23 20:12:03 +0000 - Fix tests due to change in dead_code diagnostic. (rust-lang/cargo#10785) - Stabilize config-cli (rust-lang/cargo#10755) - Restrict duplicate deps warning only to published packages (rust-lang/cargo#10767) - Use fingerprint_hash when computing fingerprints for custom targets (rust-lang/cargo#10746) - Add preloading for workspace packages in `resolve_with_previous` (rust-lang/cargo#10761) - capitalise, for consistency (rust-lang/cargo#10772) - remove unused dependency from benchsuite (rust-lang/cargo#10774) - docs(contrib): Add documentation for ui tests (rust-lang/cargo#10758)

Update cargo 8 commits in 03a849043e25104e8b7ad0d4a96c525787b69379..a5e08c4703f202e30cdaf80ca3e7c00baa59c496 2022-06-20 14:47:36 +0000 to 2022-06-23 20:12:03 +0000 - Fix tests due to change in dead_code diagnostic. (rust-lang/cargo#10785) - Stabilize config-cli (rust-lang/cargo#10755) - Restrict duplicate deps warning only to published packages (rust-lang/cargo#10767) - Use fingerprint_hash when computing fingerprints for custom targets (rust-lang/cargo#10746) - Add preloading for workspace packages in `resolve_with_previous` (rust-lang/cargo#10761) - capitalise, for consistency (rust-lang/cargo#10772) - remove unused dependency from benchsuite (rust-lang/cargo#10774) - docs(contrib): Add documentation for ui tests (rust-lang/cargo#10758)

Pkgsrc changes: * Adjust patches as needed & checksum updates. Upstream changes: Version 1.63.0 (2022-08-11) ========================== Language -------- - [Remove migrate borrowck mode for pre-NLL errors.][95565] - [Modify MIR building to drop repeat expressions with length zero.][95953] - [Remove label/lifetime shadowing warnings.][96296] - [Allow explicit generic arguments in the presence of `impl Trait` args.] [96868] - [Make `cenum_impl_drop_cast` warnings deny-by-default.][97652] - [Prevent unwinding when `-C panic=abort` is used regardless of declared ABI.][96959] - [lub: don't bail out due to empty binders.][97867] Compiler -------- - [Stabilize the `bundle` native library modifier,][95818] also removing the deprecated `static-nobundle` linking kind. - [Add Apple WatchOS compile targets\*.][95243] - [Add a Windows application manifest to rustc-main.][96737] \* Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Implement `Copy`, `Clone`, `PartialEq` and `Eq` for `core::fmt::Alignment`.][94530] - [Extend `ptr::null` and `null_mut` to all thin (including extern) types.][94954] - [`impl Read and Write for VecDeque<u8>`.][95632] - [STD support for the Nintendo 3DS.][95897] - [Make write/print macros eagerly drop temporaries.][96455] - [Implement internal traits that enable `[OsStr]::join`.][96881] - [Implement `Hash` for `core::alloc::Layout`.][97034] - [Add capacity documentation for `OsString`.][97202] - [Put a bound on collection misbehavior.][97316] - [Make `std::mem::needs_drop` accept `?Sized`.][97675] - [`impl Termination for Infallible` and then make the `Result` impls of `Termination` more generic.][97803] - [Document Rust's stance on `/proc/self/mem`.][97837] Stabilized APIs --------------- - [`array::from_fn`] - [`Box::into_pin`] - [`BinaryHeap::try_reserve`] - [`BinaryHeap::try_reserve_exact`] - [`OsString::try_reserve`] - [`OsString::try_reserve_exact`] - [`PathBuf::try_reserve`] - [`PathBuf::try_reserve_exact`] - [`Path::try_exists`] - [`Ref::filter_map`] - [`RefMut::filter_map`] - [`NonNull::<[T]>::len`][`NonNull::<slice>::len`] - [`ToOwned::clone_into`] - [`Ipv6Addr::to_ipv4_mapped`] - [`unix::io::AsFd`] - [`unix::io::BorrowedFd<'fd>`] - [`unix::io::OwnedFd`] - [`windows::io::AsHandle`] - [`windows::io::BorrowedHandle<'handle>`] - [`windows::io::OwnedHandle`] - [`windows::io::HandleOrInvalid`] - [`windows::io::HandleOrNull`] - [`windows::io::InvalidHandleError`] - [`windows::io::NullHandleError`] - [`windows::io::AsSocket`] - [`windows::io::BorrowedSocket<'handle>`] - [`windows::io::OwnedSocket`] - [`thread::scope`] - [`thread::Scope`] - [`thread::ScopedJoinHandle`] These APIs are now usable in const contexts: - [`array::from_ref`] - [`slice::from_ref`] - [`intrinsics::copy`] - [`intrinsics::copy_nonoverlapping`] - [`<*const T>::copy_to`] - [`<*const T>::copy_to_nonoverlapping`] - [`<*mut T>::copy_to`] - [`<*mut T>::copy_to_nonoverlapping`] - [`<*mut T>::copy_from`] - [`<*mut T>::copy_from_nonoverlapping`] - [`str::from_utf8`] - [`Utf8Error::error_len`] - [`Utf8Error::valid_up_to`] - [`Condvar::new`] - [`Mutex::new`] - [`RwLock::new`] Cargo ----- - [Stabilize the `--config path` command-line argument.][cargo/10755] - [Expose rust-version in the environment as `CARGO_PKG_RUST_VERSION`.][cargo/10713] Compatibility Notes ------------------- - [`#[link]` attributes are now checked more strictly,][96885] which may introduce errors for invalid attribute arguments that were previously ignored. Internal Changes ---------------- These changes provide no direct user facing benefits, but represent significant improvements to the internals and overall performance of rustc and related tools. - [Prepare Rust for LLVM opaque pointers.][94214] [94214]: rust-lang/rust#94214 [94530]: rust-lang/rust#94530 [94954]: rust-lang/rust#94954 [95243]: rust-lang/rust#95243 [95565]: rust-lang/rust#95565 [95632]: rust-lang/rust#95632 [95818]: rust-lang/rust#95818 [95897]: rust-lang/rust#95897 [95953]: rust-lang/rust#95953 [96296]: rust-lang/rust#96296 [96455]: rust-lang/rust#96455 [96737]: rust-lang/rust#96737 [96868]: rust-lang/rust#96868 [96881]: rust-lang/rust#96881 [96885]: rust-lang/rust#96885 [96959]: rust-lang/rust#96959 [97034]: rust-lang/rust#97034 [97202]: rust-lang/rust#97202 [97316]: rust-lang/rust#97316 [97652]: rust-lang/rust#97652 [97675]: rust-lang/rust#97675 [97803]: rust-lang/rust#97803 [97837]: rust-lang/rust#97837 [97867]: rust-lang/rust#97867 [cargo/10713]: rust-lang/cargo#10713 [cargo/10755]: rust-lang/cargo#10755 [`array::from_fn`]: https://doc.rust-lang.org/stable/std/array/fn.from_fn.html [`Box::into_pin`]: https://doc.rust-lang.org/stable/std/boxed/struct.Box.html#method.into_pin [`BinaryHeap::try_reserve_exact`]: https://doc.rust-lang.org/stable/alloc/collections/binary_heap/struct.BinaryHeap.html#method.try_reserve_exact [`BinaryHeap::try_reserve`]: https://doc.rust-lang.org/stable/std/collections/struct.BinaryHeap.html#method.try_reserve [`OsString::try_reserve`]: https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.try_reserve [`OsString::try_reserve_exact`]: https://doc.rust-lang.org/stable/std/ffi/struct.OsString.html#method.try_reserve_exact [`PathBuf::try_reserve`]: https://doc.rust-lang.org/stable/std/path/struct.PathBuf.html#method.try_reserve [`PathBuf::try_reserve_exact`]: https://doc.rust-lang.org/stable/std/path/struct.PathBuf.html#method.try_reserve_exact [`Path::try_exists`]: https://doc.rust-lang.org/stable/std/path/struct.Path.html#method.try_exists [`Ref::filter_map`]: https://doc.rust-lang.org/stable/std/cell/struct.Ref.html#method.filter_map [`RefMut::filter_map`]: https://doc.rust-lang.org/stable/std/cell/struct.RefMut.html#method.filter_map [`NonNull::<slice>::len`]: https://doc.rust-lang.org/stable/std/ptr/struct.NonNull.html#method.len [`ToOwned::clone_into`]: https://doc.rust-lang.org/stable/std/borrow/trait.ToOwned.html#method.clone_into [`Ipv6Addr::to_ipv4_mapped`]: https://doc.rust-lang.org/stable/std/net/struct.Ipv6Addr.html#method.to_ipv4_mapped [`unix::io::AsFd`]: https://doc.rust-lang.org/stable/std/os/unix/io/trait.AsFd.html [`unix::io::BorrowedFd<'fd>`]: https://doc.rust-lang.org/stable/std/os/unix/io/struct.BorrowedFd.html [`unix::io::OwnedFd`]: https://doc.rust-lang.org/stable/std/os/unix/io/struct.OwnedFd.html [`windows::io::AsHandle`]: https://doc.rust-lang.org/stable/std/os/windows/io/trait.AsHandle.html [`windows::io::BorrowedHandle<'handle>`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.BorrowedHandle.html [`windows::io::OwnedHandle`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.OwnedHandle.html [`windows::io::HandleOrInvalid`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.HandleOrInvalid.html [`windows::io::HandleOrNull`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.HandleOrNull.html [`windows::io::InvalidHandleError`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.InvalidHandleError.html [`windows::io::NullHandleError`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.NullHandleError.html [`windows::io::AsSocket`]: https://doc.rust-lang.org/stable/std/os/windows/io/trait.AsSocket.html [`windows::io::BorrowedSocket<'handle>`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.BorrowedSocket.html [`windows::io::OwnedSocket`]: https://doc.rust-lang.org/stable/std/os/windows/io/struct.OwnedSocket.html [`thread::scope`]: https://doc.rust-lang.org/stable/std/thread/fn.scope.html [`thread::Scope`]: https://doc.rust-lang.org/stable/std/thread/struct.Scope.html [`thread::ScopedJoinHandle`]: https://doc.rust-lang.org/stable/std/thread/struct.ScopedJoinHandle.html [`array::from_ref`]: https://doc.rust-lang.org/stable/std/array/fn.from_ref.html [`slice::from_ref`]: https://doc.rust-lang.org/stable/std/slice/fn.from_ref.html [`intrinsics::copy`]: https://doc.rust-lang.org/stable/std/intrinsics/fn.copy.html [`intrinsics::copy_nonoverlapping`]: https://doc.rust-lang.org/stable/std/intrinsics/fn.copy_nonoverlapping.html [`<*const T>::copy_to`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to [`<*const T>::copy_to_nonoverlapping`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to_nonoverlapping [`<*mut T>::copy_to`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to-1 [`<*mut T>::copy_to_nonoverlapping`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_to_nonoverlapping-1 [`<*mut T>::copy_from`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_from [`<*mut T>::copy_from_nonoverlapping`]: https://doc.rust-lang.org/stable/std/primitive.pointer.html#method.copy_from_nonoverlapping [`str::from_utf8`]: https://doc.rust-lang.org/stable/std/str/fn.from_utf8.html [`Utf8Error::error_len`]: https://doc.rust-lang.org/stable/std/str/struct.Utf8Error.html#method.error_len [`Utf8Error::valid_up_to`]: https://doc.rust-lang.org/stable/std/str/struct.Utf8Error.html#method.valid_up_to [`Condvar::new`]: https://doc.rust-lang.org/stable/std/sync/struct.Condvar.html#method.new [`Mutex::new`]: https://doc.rust-lang.org/stable/std/sync/struct.Mutex.html#method.new [`RwLock::new`]: https://doc.rust-lang.org/stable/std/sync/struct.RwLock.html#method.new

rust-highfive assigned ehuss Jun 13, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 13, 2022

jonhoo mentioned this pull request Jun 13, 2022

Tracking issue for config-cli #7722

Closed

2 tasks

Muscraft mentioned this pull request Jun 14, 2022

chore: Upgrade to clap 3.2 #10753

Merged

jonhoo force-pushed the stabilize-config-cli branch from 11aeeef to dec1ea5 Compare June 15, 2022 00:16

Jon Gjengset added 2 commits June 17, 2022 22:44

Allow --config path without config-include

103cff6

As per rust-lang#7722 (comment)

Stabilize --config

39c3173

FCP rust-lang#7722 (comment) Closes rust-lang#7722.

jonhoo force-pushed the stabilize-config-cli branch from dec1ea5 to 39c3173 Compare June 17, 2022 22:46

weihanglo reviewed Jun 21, 2022

View reviewed changes

Jon Gjengset added 2 commits June 21, 2022 16:07

Don't refer to --config as unstable

0ecdde5

Include --config in cargo help output

7eefb42

weihanglo approved these changes Jun 22, 2022

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 22, 2022

bors merged commit ed549d8 into rust-lang:master Jun 22, 2022

bors mentioned this pull request Jun 22, 2022

Stabilize -Zmultitarget #10766

Merged

jonhoo deleted the stabilize-config-cli branch June 22, 2022 20:55

jonhoo mentioned this pull request Jun 22, 2022

Update cargo rust-lang/rust#98395

Merged

weihanglo added the relnotes Release-note worthy label Jun 22, 2022

ehuss added this to the 1.63.0 milestone Jul 1, 2022

This was referenced Aug 12, 2022

[nextest-runner] support changes to CLI config options added in Rust 1.63 nextest-rs/nextest#467

Merged

Environment variables override cargo --config <filename> in precedence #10992

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stabilize config-cli #10755

Stabilize config-cli #10755

jonhoo commented Jun 13, 2022

rust-highfive commented Jun 13, 2022

jonhoo commented Jun 13, 2022 •

edited

Loading

epage commented Jun 13, 2022

epage commented Jun 14, 2022

jonhoo commented Jun 14, 2022

jonhoo commented Jun 15, 2022 •

edited

Loading

bors commented Jun 17, 2022

jonhoo commented Jun 17, 2022

jonhoo commented Jun 20, 2022

weihanglo left a comment

jonhoo commented Jun 21, 2022

weihanglo left a comment

ehuss commented Jun 22, 2022

bors commented Jun 22, 2022

bors commented Jun 22, 2022

bors commented Jun 22, 2022

jonhoo commented Jun 22, 2022

	multi_opt(
	"config",
	"KEY=VALUE",
	"Override a configuration value (unstable)",
	)

Stabilize config-cli #10755

Stabilize config-cli #10755

Conversation

jonhoo commented Jun 13, 2022

rust-highfive commented Jun 13, 2022

jonhoo commented Jun 13, 2022 • edited Loading

epage commented Jun 13, 2022

epage commented Jun 14, 2022

jonhoo commented Jun 14, 2022

jonhoo commented Jun 15, 2022 • edited Loading

bors commented Jun 17, 2022

jonhoo commented Jun 17, 2022

jonhoo commented Jun 20, 2022

weihanglo left a comment

Choose a reason for hiding this comment

jonhoo commented Jun 21, 2022

weihanglo left a comment

Choose a reason for hiding this comment

ehuss commented Jun 22, 2022

bors commented Jun 22, 2022

bors commented Jun 22, 2022

bors commented Jun 22, 2022

jonhoo commented Jun 22, 2022

jonhoo commented Jun 13, 2022 •

edited

Loading

jonhoo commented Jun 15, 2022 •

edited

Loading