Remove support for alias `-Z instrument-coverage` #117111

Zalathar · 2023-10-24T02:10:37Z

This flag was stabilized in rustc 1.60.0 (2022-04-07) as -C instrument-coverage, but the old unstable flag was kept around (with a warning) as an alias to ease migration.

It should now be reasonable to remove the somewhat tricky code that implemented that alias.

Fixes #116980.

rustbot · 2023-10-24T02:10:45Z

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

Zalathar · 2023-10-24T02:12:57Z

(I've marked this as a draft for now because it's going to conflict with #116094 and I'd prefer not to accidentally block that PR again. Should be easy to rebase this once that PR has had a chance to land.)

Zalathar · 2023-10-24T02:13:19Z

@rustbot label +A-code-coverage

compiler-errors · 2023-10-24T02:16:51Z

I'm surprised that the -Z flag was kept around -- at least after a cursory search, it seems like other stabilization PRs typically remove their -Z flags immediately.

Given that this is an nightly-only flag which necessarily doesn't have any stability guarantees, and nightly users would have hit this warning for >1 year, I'm happy to r+ this after it's taken out of draft.

cc @rust-lang/compiler, if anyone has other feelings, speak up :)

wesleywiser

We've been leaving around the -Z flag more recently when stabilizing some compiler features (IIRC -{C,Z}symbol-mangling-version is an example). It's well past time to remove the unstable flag!

bors · 2023-10-24T22:25:57Z

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

This flag was stabilized in rustc 1.60.0 as `-C instrument-coverage`, but the old unstable flag was kept around as an alias to ease migration.

Zalathar · 2023-10-25T00:42:13Z

Rebased to resolve conflict, and added an unstable case for -Cinstrument-coverage=branch.

I also added a UI test to confirm that -Cinstrument-coverage=branch is unstable.

Zalathar · 2023-10-25T00:43:39Z

This should now be ready to go.

compiler-errors · 2023-10-25T15:25:40Z

@bors r+

bors · 2023-10-25T15:25:41Z

📌 Commit 65b0f6a has been approved by compiler-errors

It is now in the queue for this repository.

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#117111 (Remove support for alias `-Z instrument-coverage`) - rust-lang#117141 (Require target features to match exactly during inlining) - rust-lang#117152 (Fix unwrap suggestion for async fn) - rust-lang#117154 (implement C ABI lowering for CSKY) - rust-lang#117159 (Work around the fact that `check_mod_type_wf` may spuriously return `ErrorGuaranteed`) - rust-lang#117163 (compiletest: Display compilation errors in mir-opt tests) - rust-lang#117173 (Make `Iterator` a lang item) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117111 - Zalathar:zinstrument, r=compiler-errors Remove support for alias `-Z instrument-coverage` This flag was stabilized in rustc 1.60.0 (2022-04-07) as `-C instrument-coverage`, but the old unstable flag was kept around (with a warning) as an alias to ease migration. It should now be reasonable to remove the somewhat tricky code that implemented that alias. Fixes rust-lang#116980.

Remove support for alias `-Z symbol-mangling-version` (This is very similar to the removal of `-Z instrument-coverage` in rust-lang#117111.) `-C symbol-mangling-version` was stabilized back in rustc 1.59.0 (2022-02-24) via rust-lang#90128, with the old unstable flag kept around (with a warning) as an alias to ease migration.

Rollup merge of rust-lang#117509 - Zalathar:zsymbol, r=petrochenkov Remove support for alias `-Z symbol-mangling-version` (This is very similar to the removal of `-Z instrument-coverage` in rust-lang#117111.) `-C symbol-mangling-version` was stabilized back in rustc 1.59.0 (2022-02-24) via rust-lang#90128, with the old unstable flag kept around (with a warning) as an alias to ease migration.

rustbot assigned compiler-errors Oct 24, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 24, 2023

rustbot added the A-code-coverage Area: Source-based code coverage (-Cinstrument-coverage) label Oct 24, 2023

Swatinem approved these changes Oct 24, 2023

View reviewed changes

wesleywiser approved these changes Oct 24, 2023

View reviewed changes

Zalathar added 2 commits October 25, 2023 11:36

coverage: UI test for unstable value -C instrument-coverage=branch

bc18509

Remove support for alias -Z instrument-coverage

65b0f6a

This flag was stabilized in rustc 1.60.0 as `-C instrument-coverage`, but the old unstable flag was kept around as an alias to ease migration.

Zalathar force-pushed the zinstrument branch from 605165b to 65b0f6a Compare October 25, 2023 00:40

Zalathar marked this pull request as ready for review October 25, 2023 00:42

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 Oct 25, 2023

matthiaskrgr mentioned this pull request Oct 25, 2023

Rollup of 7 pull requests #117180

Merged

bors merged commit 24254d2 into rust-lang:master Oct 25, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 25, 2023

Zalathar deleted the zinstrument branch October 25, 2023 22:53

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Zalathar mentioned this pull request Nov 2, 2023

Remove support for alias -Z symbol-mangling-version #117509

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove support for alias `-Z instrument-coverage` #117111

Remove support for alias `-Z instrument-coverage` #117111

Zalathar commented Oct 24, 2023

rustbot commented Oct 24, 2023

Zalathar commented Oct 24, 2023

Zalathar commented Oct 24, 2023

compiler-errors commented Oct 24, 2023

wesleywiser left a comment

bors commented Oct 24, 2023

Zalathar commented Oct 25, 2023

Zalathar commented Oct 25, 2023

compiler-errors commented Oct 25, 2023

bors commented Oct 25, 2023

Remove support for alias -Z instrument-coverage #117111

Remove support for alias -Z instrument-coverage #117111

Conversation

Zalathar commented Oct 24, 2023

rustbot commented Oct 24, 2023

Zalathar commented Oct 24, 2023

Zalathar commented Oct 24, 2023

compiler-errors commented Oct 24, 2023

wesleywiser left a comment

Choose a reason for hiding this comment

bors commented Oct 24, 2023

Zalathar commented Oct 25, 2023

Zalathar commented Oct 25, 2023

compiler-errors commented Oct 25, 2023

bors commented Oct 25, 2023

Remove support for alias `-Z instrument-coverage` #117111

Remove support for alias `-Z instrument-coverage` #117111