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

Rollup of 5 pull requests #64478

Merged
merged 11 commits into from
Sep 15, 2019
Merged

Rollup of 5 pull requests #64478

merged 11 commits into from
Sep 15, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 15, 2019

Successful merges:

Failed merges:

r? @ghost

petrochenkov and others added 11 commits September 14, 2019 17:36
These attributes are now deprecated; they don't have any use anymore.
…asper

def_collector: Do not ICE on attributes on unnamed fields

The primary issue here is that the expansion infra needs to visit a field in isolation, and fields don't know their own indices during expansion, so they have to be kept in some other place (e.g. `struct Definitions`).

Fixes rust-lang#64385
resolve: Tweak some expected/found wording
…entril

Warn on no_start, crate_id attribute use

These attributes are now deprecated; they don't have any use anymore.

`no_start` stopped being applicable in 3ee916e as part of rust-lang#18967. Ideally we would've removed it pre-1.0, but since that didn't happen let's at least mark it deprecated.

`crate_id` was renamed to `crate_name` in 50ee1ec as part of rust-lang#15319. Ideally we would've followed that up with a removal of crate_id itself as well, but that didn't happen; this PR finally marks it as deprecated at least.

Fixes rust-lang#43142 and resolves rust-lang#43144.
Use try_fold instead of manually carrying an accumulator

r? @RalfJung
@Centril
Copy link
Contributor Author

Centril commented Sep 15, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Contributor

bors commented Sep 15, 2019

📌 Commit 88bd564 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 15, 2019
@bors
Copy link
Contributor

bors commented Sep 15, 2019

⌛ Testing commit 88bd564 with merge 8bf776d...

bors added a commit that referenced this pull request Sep 15, 2019
Rollup of 5 pull requests

Successful merges:

 - #64457 (def_collector: Do not ICE on attributes on unnamed fields)
 - #64463 (resolve: Tweak some expected/found wording)
 - #64471 (Warn on no_start, crate_id attribute use)
 - #64473 (Use try_fold instead of manually carrying an accumulator)
 - #64475 (simplify the initialization)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 15, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 15, 2019
@bors bors merged commit 88bd564 into rust-lang:master Sep 15, 2019
@Centril Centril deleted the rollup-bnt51w1 branch September 15, 2019 10:13
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: 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.

None yet

5 participants