test(rustflags): Verify -Cmetadata directly, not through -Cextra-filename #14846

epage · 2024-11-20T21:30:58Z

What does this PR try to resolve?

This unblocks experimenting with having these diverge for #8716

How should we test and review this PR?

Additional information

This will allow changing `Execs::run` return type

This will allow more custom assertions.

rustbot · 2024-11-20T21:31:04Z

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

weihanglo · 2024-11-20T23:47:30Z

crates/cargo-test-support/src/lib.rs

@@ -1042,34 +1040,32 @@ impl Execs {
    }

    #[track_caller]
-    pub fn run(&mut self) {
+    pub fn run(&mut self) -> RawOutput {


Does this mean Execs::exec_with_output is kinda obsolete and we should remove it?

Somehow I missed that function but I can still see them serving different roles as run still applies any assertions and "successful exit" is the most basic one which provides better error messages than unwrapping the result would.

... ok so 44 out of 50 uses of exec_with_output can be replaced with the new run and provide a better experience. Seems like a worthwhile conversion though maybe not for this PR.

tests/testsuite/rustflags.rs

…name This unblocks experimenting with having these diverge for rust-lang#8716

This is a follow up to rust-lang#14846 which changed `run` to return the `RawOutput`. Reasons I didn't "update" some code to the new `run` return value - We were actually using `ProcessBuilder::exec_with_output` and I didn't want to disentangle what it would take to switch to `Execs` - We did processing on the `Result` and I didn't want to check how that could be updated

### What does this PR try to resolve? This is a follow up to #14846 which changed `run` to return the `RawOutput`. Reasons I didn't "update" some code to the new `run` return value - We were actually using `ProcessBuilder::exec_with_output` and I didn't want to disentangle what it would take to switch to `Execs` - We did processing on the `Result` and I didn't want to check how that could be updated ### How should we test and review this PR? ### Additional information

Update cargo and books 10 commits in 66221abdeca2002d318fde6efff516aab091df0e..4c39aaff66862cc0da52fe529aa1990bb8bb9a22 2024-11-19 21:30:02 +0000 to 2024-11-25 16:36:17 +0000 - feat: Stabilize Edition 2024 (rust-lang/cargo#14828) - Improve error handling when PathSource is relative (rust-lang/cargo#14854) - test: address test output nondeterminism (rust-lang/cargo#14855) - chore: move supports-unicode to workspace deps (rust-lang/cargo#14853) - Check build target supports std when building with -Zbuild-std=std (rust-lang/cargo#14183) - fix(publish): Allow dry-run of a non-bumped workspace (rust-lang/cargo#14847) - test: Switch from 'exec_with_output' to 'run' (rust-lang/cargo#14848) - test(rustflags): Verify -Cmetadata directly, not through -Cextra-filename (rust-lang/cargo#14846) - chore: remove bors mentions (rust-lang/cargo#14845) - Clarify how `cargo::metadata` env var is selected (rust-lang/cargo#14842) ## nomicon 1 commits in eac89a3cbe6c4714e5029ae8b5a1c556fd4e8c42..0674321898cd454764ab69702819d39a919afd68 2024-11-16 14:05:28 +0000 to 2024-11-19 12:35:48 +0000 - races: Clarify a “mostly” that might be misread (rust-lang/nomicon#468) ## reference 12 commits in 41ccb0e6478305401dad92e8fd3d04a4304edb4c..5c86c739ec71b8bc839310ff47fa94e94635bba9 2024-11-15 21:45:16 +0000 to 2024-11-25 17:23:35 +0000 - Document `gen` keyword as reserved in Rust 2024 (rust-lang/reference#1501) - 2024: Update `expr` macro fragment specifier (rust-lang/reference#1639) - Add rust_2024 prelude (rust-lang/reference#1552) - 2024: Add reserved syntax (rust-lang/reference#1652) - Add Lifetime Capture Rules 2024 (rust-lang/reference#1601) - Add a section dedicated to Edition 2024 changes to temporary scopes (rust-lang/reference#1592) - 2024: Add unsafe attribute differences (rust-lang/reference#1579) - 2024: Add updates for unsafe extern blocks (rust-lang/reference#1565) - Fix rule for lazy boolean temporary drop scope (rust-lang/reference#1681) - Raw lifetimes (rust-lang/reference#1603) - Fix some missing emdashes (rust-lang/reference#1676) - Added an additional example of lifetime elision (rust-lang/reference#1678) ## rustc-dev-guide 6 commits in b679e71c2d66c6fe13e06b99ac61773b866213f0..787b4166ccc67bd8f72a6e3ef6685ce9ce82909a 2024-11-18 16:18:15 +0800 to 2024-11-22 11:17:57 +0000 - Remove constants section as it is outdated - Flatten generic parameter defs section - Add instructions to test error code docs (rust-lang/rustc-dev-guide#2145) - Reorganize the "Source Code Representation" chapters (rust-lang/rustc-dev-guide#2142) - Make `Diag` a clickable link in Suggestion section (rust-lang/rustc-dev-guide#2140) - update for rustc_intrinsic_const_stable_indirect (rust-lang/rustc-dev-guide#2138) ## edition-guide 6 commits in 915f9b319c2823f310430ecdecd86264a7870d7e..f48b0e842a3911c63240e955d042089e9e0894c7 2024-11-06 07:23:07 +0000 to 2024-11-25 16:20:27 +0000 - Update for 2024 stabilization (rust-lang/edition-guide#338) - Enable triagebot merge-conflicts and shortcuts (rust-lang/edition-guide#336) - Organize the 2024 chapters into sub-chapters by category (rust-lang/edition-guide#334) - Fix broken Cargo Book link in cargo-resolver.md (rust-lang/edition-guide#335) - Edition 2024 guide for temporary lifetime changes (rust-lang/edition-guide#318) - 2024: rustfmt sorting (rust-lang/edition-guide#332)

epage added 2 commits November 18, 2024 20:52

test: Ensure we don't rely on unit return values

f80fc01

This will allow changing `Execs::run` return type

feat(test): Provide access to 'RawOutput' from 'Execs::run'

8b41a8e

This will allow more custom assertions.

rustbot assigned weihanglo Nov 20, 2024

rustbot added A-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 20, 2024

epage force-pushed the metadata branch from c3f9529 to abc5bae Compare November 20, 2024 21:33

weihanglo reviewed Nov 21, 2024

View reviewed changes

tests/testsuite/rustflags.rs Outdated Show resolved Hide resolved

test(rustflags): Verify -Cmetadata directly, not through -Cextra-file…

0b10d6f

…name This unblocks experimenting with having these diverge for rust-lang#8716

epage force-pushed the metadata branch from abc5bae to 0b10d6f Compare November 21, 2024 18:49

weihanglo approved these changes Nov 21, 2024

View reviewed changes

weihanglo enabled auto-merge November 21, 2024 19:00

weihanglo added this pull request to the merge queue Nov 21, 2024

Merged via the queue into rust-lang:master with commit dfcfa44 Nov 21, 2024
20 checks passed

epage mentioned this pull request Nov 21, 2024

test: Switch from 'exec_with_output' to 'run' #14848

Merged

epage deleted the metadata branch November 21, 2024 20:08

ehuss mentioned this pull request Nov 25, 2024

Update cargo and books rust-lang/rust#133465

Merged

weihanglo mentioned this pull request Nov 25, 2024

fix(fingerprint): Don't throwaway the cache on RUSTFLAGS changes #14830

Open

weihanglo added this to the 1.85.0 milestone Nov 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

test(rustflags): Verify -Cmetadata directly, not through -Cextra-filename #14846

test(rustflags): Verify -Cmetadata directly, not through -Cextra-filename #14846

epage commented Nov 20, 2024

rustbot commented Nov 20, 2024

weihanglo Nov 20, 2024

epage Nov 21, 2024

test(rustflags): Verify -Cmetadata directly, not through -Cextra-filename #14846

test(rustflags): Verify -Cmetadata directly, not through -Cextra-filename #14846

Conversation

epage commented Nov 20, 2024

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rustbot commented Nov 20, 2024

weihanglo Nov 20, 2024

Choose a reason for hiding this comment

epage Nov 21, 2024

Choose a reason for hiding this comment