Skip to content

[beta] backports - #88946

Merged
bors merged 16 commits into
rust-lang:betafrom
cuviper:beta-next
Sep 17, 2021
Merged

[beta] backports#88946
bors merged 16 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuvipercuviper commented Sep 14, 2021•
edited
Loading

Copy link
Copy Markdown
Member

Also drop stage0 rustfmt, because that's only supposed to be used on master.

r? @Mark-Simulacrum

@rust-highfive

rust-highfive commented Sep 14, 2021

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 14, 2021
@Mark-Simulacrum

Mark-Simulacrum commented Sep 14, 2021

Copy link
Copy Markdown
Member

I think this'll need a backport-of: none on the first commit, but CI will complain if necessary about that, I think.

@cuviper

cuviper commented Sep 14, 2021•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Ah, sorry, I didn't use the local cherry-pick.sh at all, just git cherry-pick -x ... which has its own format.

However:

Run src/ci/scripts/verify-backported-commits.sh
src/ci/scripts/verify-backported-commits.sh
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
env:
CI_JOB_NAME: x86_64-gnu-tools
SCCACHE_BUCKET: rust-lang-ci-sccache2
TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate
CACHE_DOMAIN: ci-caches.rust-lang.org
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
IMAGE: x86_64-gnu-tools
fatal: unknown commit 53fd98ca776cb875bc9e5514f56b52eb74f9e7a9
All commits in `HEAD` are present in `master`

🤔

@cuvipercuviper mentioned this pull request Sep 14, 2021
Open
cuviperand others added 4 commits September 14, 2021 15:10
@cuviper
Drop stage0 rustfmt from beta
bcab138
backport-of: nothing
@Emilgardis@cuviper
fix ICE on hidden tuple variant fields
48f94e5
this also renders them as `_`, which rustdoc previously did not.
(cherry picked from commit 4a915ac)
@camelid@cuviper
Fix 2021 dyn suggestion that used code as label
5c76db1
The arguments to `span_suggestion` were in the wrong order, so the error
looked like this:
error[E0783]: trait objects without an explicit `dyn` are deprecated
--> src/test/ui/editions/dyn-trait-sugg-2021.rs:10:5
|
10 | Foo::hi(123);
| ^^^ help: <dyn Foo>: `use `dyn``
Now the error looks like this, as expected:
error[E0783]: trait objects without an explicit `dyn` are deprecated
--> src/test/ui/editions/dyn-trait-sugg-2021.rs:10:5
|
10 | Foo::hi(123);
| ^^^ help: use `dyn`: `<dyn Foo>`
This issue was only present in the 2021 error; the 2018 lint was
correct.
(cherry picked from commit 486d79f)
@dns2utf8@cuviper
Workaround blink/chromium grid layout limitation of 1000 rows
6387590
See rust-lang#88545 for more details
(cherry picked from commit 0bf16af)
@cuviper

cuviper commented Sep 14, 2021

Copy link
Copy Markdown
MemberAuthor

I added backport-of: nothing on the new commit, and left the others alone since they were clean cherry-picks and shouldn't need a note. I also filed #88947 for the apparently-broken CI script.

@bors r=Mark-Simulacrum

@bors

bors commented Sep 14, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 6387590 has been approved by Mark-Simulacrum

@borsbors 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 14, 2021
@cuviper

cuviper commented Sep 14, 2021

Copy link
Copy Markdown
MemberAuthor

@bors rollup=never

@bors

bors commented Sep 15, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 6387590 with merge 3c690cc2be8f81721cfecf61fd5b692eff376fe2...

@bors

bors commented Sep 15, 2021

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 15, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cuviper

cuviper commented Sep 15, 2021

Copy link
Copy Markdown
MemberAuthor

I guess that failure is #88924.

@ehuss

ehuss commented Sep 15, 2021

Copy link
Copy Markdown
Contributor

@bors retry

#88924

@borsbors 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 15, 2021
@ehuss

ehuss commented Sep 16, 2021

Copy link
Copy Markdown
Contributor

@bors r-

I'm pretty sure this will fail without #88977.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 16, 2021
@cuvipercuviper mentioned this pull request Sep 16, 2021
Merged
matthewjasperand others added 12 commits September 16, 2021 09:10
@matthewjasper@cuviper
Change scope of temporaries in match guards
726ab14
Each pattern in a match arm has its own copy of the match guard in MIR,
with its own temporary, so it has to be dropped before the the guards
are joined to the single copy of the arm.
(cherry picked from commit ad7f109)
hyd-dev@cuviper
Add a regression test forrust-lang#88649
244a097
(cherry picked from commit 214eef0)
@pnkfelix@cuviper
Revert "Allow formatting Anonymous{Struct, Union} declarations"
74760e0
This reverts commit 64acb7d.
(cherry picked from commit 2691a39)
@pnkfelix@cuviper
Revert "Add test for pretty printing anonymous types"
d670969
This reverts commit d59b1f1.
(cherry picked from commit 2041fb1)
@pnkfelix@cuviper
Revert "Fix ast expanded printing for anonymous types"
2e9ac2c
This reverts commit 5b4bc05.
(cherry picked from commit 5560f6d)
@pnkfelix@cuviper
Revert "Add test for restriction of anonymous types on validation"
f6d517a
This reverts commit 8a1dd69.
(cherry picked from commit f38ec9c)
@pnkfelix@cuviper
Manually crafted revert ofd4ad050.
48625e7
(cherry picked from commit b6aa7e3)
@pnkfelix@cuviper
Revert "Implement Anonymous{Struct, Union} in the AST"
983c1b1
This reverts commit 059b68d.
Note that this was manually adjusted to retain some of the refactoring
introduced by commit 059b68d, so that it could
likewise retain the correction introduced in commit
5b4bc05
(cherry picked from commit 91feb76)
@pnkfelix@cuviper
Re-add71a7f8fpost-revert.
73c80cd
(cherry picked from commit f26f1ed)
@pnkfelix@cuviper
regression test for issuerust-lang#88583.
533b5f7
(cherry picked from commit 35370a7)
@ehuss@cuviper
Disable validate_maintainers.
207340d
(cherry picked from commit 6070763)
@ehuss@cuviper
Disable debuginfo test on Windows that fails in new cdb version.
ce1c9dc
(cherry picked from commit 66a1987)
@cuviper

cuviper commented Sep 16, 2021

Copy link
Copy Markdown
MemberAuthor

I added additional backports, including that CI fix.

@cuvipercuviper added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 16, 2021
@Mark-Simulacrum

Mark-Simulacrum commented Sep 16, 2021

Copy link
Copy Markdown
Member

@bors r+ rollup=never

@bors

bors commented Sep 16, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit ce1c9dc has been approved by Mark-Simulacrum

@borsbors 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 16, 2021
@bors

bors commented Sep 17, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ce1c9dc with merge deef866...

@bors

bors commented Sep 17, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing deef866 to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 17, 2021
@bors
bors merged commit deef866 into rust-lang:betaSep 17, 2021
@rustbotrustbot added this to the 1.56.0 milestone Sep 17, 2021
@cuviper
cuviper deleted the beta-next branch September 21, 2021 16:42
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.56.0

Development

Successfully merging this pull request may close these issues.

12 participants

@cuviper@rust-highfive@Mark-Simulacrum@bors@rust-log-analyzer@ehuss@rustbot@Emilgardis@camelid@dns2utf8@matthewjasper@pnkfelix