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 4 pull requests #65178

Merged
merged 13 commits into from
Oct 7, 2019
Merged

Rollup of 4 pull requests #65178

merged 13 commits into from
Oct 7, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 7, 2019

Successful merges:

Failed merges:

r? @ghost

andjo403 and others added 13 commits October 5, 2019 21:12
the measureme tools summarize and crox do not alow a event to go out of scope of the parent event

codegen_and_optimize_crate ends after the codegen_crate event
- 771c5d1 Add macros in extern blocks and new proc-macro support.
- 8caabd6 Update for "modern" `meta` matcher.
- 1b44947 Update await desugaring after rust-lang#64292
Add feature gate for raw_dylib.

This PR adds the feature gate for RFC 2627 (rust-lang#58713). It doesn't contain the actual functionality.
Add I'm not sure whether i did it correctly, since this is the first time i did this.

r? @Centril
…elwoerister

remove event that causes panics in measureme tools

the measureme tools summarize and crox do not alow a event to go out of scope of the parent event

codegen_and_optimize_crate ends after the codegen_crate event

r? @wesleywiser
cc @michaelwoerister @Mark-Simulacrum
…-E0566, r=estebank

Add long error explanation for E0566

Part of rust-lang#61137.
Update reference

- Add macros in extern blocks and new proc-macro support.
- Update for "modern" `meta` matcher.
- Update await desugaring after rust-lang#64292
@bors bors added the rollup A PR which is a rollup label Oct 7, 2019
@Centril
Copy link
Contributor Author

Centril commented Oct 7, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Oct 7, 2019

📌 Commit 68a4cfc 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 Oct 7, 2019
@bors
Copy link
Contributor

bors commented Oct 7, 2019

⌛ Testing commit 68a4cfc with merge e3cb9ea...

bors added a commit that referenced this pull request Oct 7, 2019
Rollup of 4 pull requests

Successful merges:

 - #63948 (Add feature gate for raw_dylib.)
 - #65137 (remove event that causes panics in measureme tools)
 - #65164 (Add long error explanation for E0566)
 - #65173 (Update reference)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 7, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 7, 2019
@bors bors merged commit 68a4cfc into rust-lang:master Oct 7, 2019
@Centril Centril deleted the rollup-ep1zztj branch October 7, 2019 13:21
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.

6 participants