Skip to content

Rollup of 4 pull requests - #90249

Merged
bors merged 8 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-xwtfhq3
Oct 25, 2021
Merged

Rollup of 4 pull requests#90249
bors merged 8 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-xwtfhq3

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

JohnTitorand others added 8 commits October 21, 2021 20:25
… crate
Partly address rust-lang#78543 by making the error quieter.
We don't have access to the `typeck` tables from foreign crates, so we
used to completely skip the new code when checking foreign crates. Now,
we carry on and don't provide as nice output (we don't clarify *what* is
making the `Future: !Send`), but at least we no longer emit a sea of
derived obligations in the output.
[1]: https://blog.rust-lang.org/inside-rust/2019/10/11/AsyncAwait-Not-Send-Error-Improvements.html
Both style-check and date-check are now on the 2021 edition, and this
commit also updates their repositories' submodules.
…n-future, r=tmandry
Use the "nice E0277 errors"[1] for `!Send` `impl Future` from foreign crate
Partly address rust-lang#78543 by making the error quieter.
We don't have access to the `typeck` tables from foreign crates, so we
used to completely skip the new code when checking foreign crates. Now,
we carry on and don't provide as nice output (we don't clarify *what* is
making the `Future: !Send`), but at least we no longer emit a sea of
derived obligations in the output.
[1]: https://blog.rust-lang.org/inside-rust/2019/10/11/AsyncAwait-Not-Send-Error-Improvements.html
r? `@tmandry`
Do not mention a reexported item if it's private
Fixesrust-lang#90113
The _actual_ regression was introduced in rust-lang#73652, then rust-lang#88838 made it worse. This fixes the issue by not counting such an import as a candidate.
…Simulacrum
tidy: Remove submodules from edition exception list
Both style-check and date-check are now on the 2021 edition, and this
PR also updates their repositories' submodules.
cc rust-lang/rustc-dev-guide#1238
cc rust-lang/reference#1099
cc rust-lang#89103 (comment)
…k-Simulacrum
Add alias for guillaume.gomez@huawei.com
Hopefully it'll stop making me appear twice in the thanks page. :)
@rustbotrustbot added the rollup A PR which is a rollup label Oct 25, 2021
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=4

@bors

bors commented Oct 25, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 34dcfd3 has been approved by matthiaskrgr

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 25, 2021
@bors

bors commented Oct 25, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 34dcfd3 with merge 32f3887...

@bors

bors commented Oct 25, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 32f3887 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2021
@bors
bors merged commit 32f3887 into rust-lang:masterOct 25, 2021
@rustbotrustbot added this to the 1.58.0 milestone Oct 25, 2021
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (32f3887): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@matthiaskrgr
matthiaskrgr deleted the rollup-xwtfhq3 branch November 20, 2021 15:04
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@matthiaskrgr@bors@rust-timer@rustbot@JohnTitor@GuillaumeGomez@estebank@camelid