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.

Sign up for GitHub

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

Jump to bottom

Update test output for drop tracking #101779

Merged
merged 7 commits into from
Sep 14, 2022
Merged

Update test output for drop tracking #101779

merged 7 commits into from
Sep 14, 2022

Conversation

eholk
Copy link
Contributor

@eholk eholk commented Sep 13, 2022

#97334 has a lot of updates to test outputs that makes the PR larger than it needs to be. This PR pulls those changes out so we can keep the other one as simple as possible.

r? @jyn514

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 13, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 13, 2022
@jyn514
Copy link
Member

jyn514 commented Sep 13, 2022

I'm confused - is the plan to keep both revisions even after drop tracking is enabled by default? In that case I guess this is fine ... I guess the larger question is how long you want to keep the -Zdrop-tracking flag around after it's enabled by default, I think I would expect it to be removed at the time its enabled.

@eholk
Copy link
Contributor Author

eholk commented Sep 13, 2022

Yeah, I'm conflicted here. I think ideally #97334 should just do the minimum necessary flip the default for -Zdrop-tracking. After this PR, the only thing left in that PR would basically be changing the flag default and updating help text. I think that's good for making it easily revertible (hopefully not needed!) and also avoiding merge conflicts. But, since drop-tracking changes the error messages, the PR gets a lot bigger unless we land those changes separately using revisions.

I don't think the -Zdrop-tracking flag needs to hang around too long, but it probably doesn't hurt to keep it for a release or two. Maybe the PR that removes the flag can also remove all the revisions I'm introducing here.

@jyn514
Copy link
Member

jyn514 commented Sep 13, 2022

After this PR, the only thing left in that PR would basically be changing the flag default and updating help text. I think that's good for making it easily revertible (hopefully not needed!) and also avoiding merge conflicts.

👍 This is convincing to me - let's keep the flag around until the first beta Crater run where drop-tracking is enabled finishes. Then we can be reasonably confident a revert isn't necessary and remove the flag and the revisions at the same time.

jyn514
jyn514 approved these changes Sep 13, 2022
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seeing all the test cases this allows to compile is really cool :)

@jyn514
Copy link
Member

jyn514 commented Sep 13, 2022

r=me once the test suite passes (use r=jyn514)

@bors delegate=eholk

@bors
Copy link
Contributor

bors commented Sep 13, 2022

✌️ @eholk can now approve this pull request

@eholk eholk force-pushed the drop-tracking-test-output branch from 7d2dff1 to 87bb475 Compare September 13, 2022 22:16
@eholk
Copy link
Contributor Author

eholk commented Sep 13, 2022

@bors r=jyn514

@bors
Copy link
Contributor

bors commented Sep 13, 2022

📌 Commit 87bb475 has been approved by jyn514

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 Sep 13, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Sep 14, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 14, 2022
@bors
Auto merge of rust-lang#101805 - Dylan-DPC:rollup-mpdlbin, r=Dylan-DPC
a926696 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#101433 (Emit a note that static bounds from HRTBs are a bug)
 - rust-lang#101684 (smol grammar changes to README.md)
 - rust-lang#101769 (rustdoc: remove redundant CSS `.out-of-band > span.since { position }`)
 - rust-lang#101772 (Also replace the placeholder for the stable_features lint)
 - rust-lang#101773 (rustdoc: remove outdated CSS `.content table` etc)
 - rust-lang#101779 (Update test output for drop tracking)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 15a5bc9 into rust-lang:master Sep 14, 2022
@rustbot rustbot added this to the 1.65.0 milestone Sep 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

Assignees

@jyn514 jyn514

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.65.0
Development

Successfully merging this pull request may close these issues.
5 participants
@eholk @jyn514 @bors @rust-highfive @rustbot