Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable] Prepare 1.74.0 release #117843

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Nov 12, 2023

https://forge.rust-lang.org/release/process.html#promote-branches-t-3-days-monday

Also backports:

r? @Mark-Simulacrum

@rustbot
Copy link
Collaborator

rustbot commented Nov 12, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Nov 12, 2023
the8472 and others added 3 commits November 12, 2023 19:59
the fix on nightly is recent and should get time to bake, removal
of the optimization is the less risky approach for a backport
This method is trying to detect macro invocations, so that it can split a span
into two parts just after the `!` of the invocation.

Under some circumstances (probably involving nested macros), it gets confused
and produces a span that is larger than the original span, and possibly extends
outside its enclosing function and even into an adjacent file.

In extreme cases, that can result in malformed coverage mappings that cause
`llvm-cov` to fail. For now, we at least want to detect these egregious cases
and avoid them, so that coverage reports can still be produced.
Without the workaround applied, this test will produce malformed mappings that
cause `llvm-cov` to fail.

(And if it does emit well-formed mappings, they should be obviously incorrect.)
@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Nov 13, 2023

📌 Commit 7e1d1d4 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors 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 Nov 13, 2023
@bors
Copy link
Contributor

bors commented Nov 13, 2023

⌛ Testing commit 7e1d1d4 with merge 79e9716...

@bors
Copy link
Contributor

bors commented Nov 13, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 79e9716 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 13, 2023
@bors bors merged commit 79e9716 into rust-lang:stable Nov 13, 2023
12 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Nov 13, 2023
@Mark-Simulacrum Mark-Simulacrum deleted the stable-next branch November 13, 2023 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants