Skip to content

Rollup of 5 pull requests - #67140

Merged
bors merged 14 commits into
rust-lang:masterfrom
Centril:rollup-h7rbw7y
Dec 8, 2019
Merged

Rollup of 5 pull requests#67140
bors merged 14 commits into
rust-lang:masterfrom
Centril:rollup-h7rbw7y

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

BartMasseyand others added 14 commits November 15, 2019 16:31
Deleted unused labels from compiler and fixed or allowed
unused labels in tests. This patch removes some gratuitous
unused labels and turns off the warning for unused labels
that are a necessary part of tests. This will permit
setting the `unused_labels` lint to `warn`.
…nneeded Index impl, remove body fn
rustc_codegen_ssa: Fix BodyAndCache reborrow to Body and change instances of body() call to derefence
rustc_mir: Fix BodyAndCache reborrow to Body and change intances of body() call to derefence
`legacy_disrectory_ownership` vs `legacy_directory_ownership`
Change unused_labels from allow to warn
Fixesrust-lang#66324, making the unused_labels lint warn instead of allow by default. I'm told @rust-lang/lang will need to review this, and perhaps will want to do a crater run.
Cleanup BodyCache
After this PR:
- `BodyCache` is renamed to `BodyAndCache`
- `ReadOnlyBodyCache` is renamed to `ReadOnlyBodyAndCache`
- `ReadOnlyBodyAndCache::body` fn is removed and all calls to it are replaced by a deref (possible due to fix of its `Deref` imp in rust-lang#65947)
cc @eddyb@oli-obk
use `#[allow(unused_attributes)]` to paper over incr.comp problem
Paper over the problem in rust-lang#58633.
r? @Mark-Simulacrum
…chenkov
Make `ForeignItem` an alias of `Item`.
Working towards the merging of items in AST and syntactically.
r? @petrochenkov
Fixes typo
`legacy_disrectory_ownership` vs `legacy_directory_ownership`
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=5 rollup=never

@bors

bors commented Dec 8, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 32e27c2 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 8, 2019
@CentrilCentril added the rollup A PR which is a rollup label Dec 8, 2019
@bors

bors commented Dec 8, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 32e27c2 with merge e862c01...

bors added a commit that referenced this pull request Dec 8, 2019
Rollup of 5 pull requests
Successful merges:
- #66325 (Change unused_labels from allow to warn)
- #66991 (Cleanup BodyCache)
- #67101 (use `#[allow(unused_attributes)]` to paper over incr.comp problem)
- #67114 (Make `ForeignItem` an alias of `Item`.)
- #67129 (Fixes typo)
Failed merges:
- #66886 (Remove the borrow check::nll submodule)
r? @ghost
@bors

bors commented Dec 8, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: Centril
Pushing e862c01 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 8, 2019
@bors
bors merged commit 32e27c2 into rust-lang:masterDec 8, 2019
@Centril
Centril deleted the rollup-h7rbw7y branch December 8, 2019 09:07
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #67140!

Tested on commit e862c01.
Direct link to PR: #67140

💔 miri on windows: test-fail → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 8, 2019
Tested on commit rust-lang/rust@e862c01.
Direct link to PR: <rust-lang/rust#67140>
💔 miri on windows: test-fail → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk@eddyb@RalfJung, @rust-lang/infra).
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.

5 participants

@Centril@bors@rust-highfive@BartMassey@Nashenas88