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 #70544

Merged
merged 8 commits into from
Mar 29, 2020
Merged

Rollup of 4 pull requests #70544

merged 8 commits into from
Mar 29, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

anyska and others added 8 commits March 27, 2020 17:14
add test for 62220

Closes rust-lang#62220

Adds a test for rust-lang#62220.

Im not sure whether `check-pass` is sufficient here. I didn't put `run-pass` in, as I'm afraid that'll fail due to the `unimplemented!()` return in the code.
… r=varkor

#[link]: mention wasm_import_module instead of cfg

`#[link(cfg)]` is perma-unstable and is not documented anywhere else. It makes more sense to mention `wasm_import_module` here since it's stable.

This makes it harder to hit rust-lang#70538 (if it weren't for this text, I wouldn't even know this feature existed).
prohibit_generics: update has_err for consts

r? @eddyb
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=4 rollup=never

@bors
Copy link
Contributor

bors commented Mar 29, 2020

📌 Commit 800ed0c has been approved by Dylan-DPC

@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 Mar 29, 2020
@bors
Copy link
Contributor

bors commented Mar 29, 2020

⌛ Testing commit 800ed0c with merge ca40a120efd3698a6417487bbae512ad59b8806f...

@bors
Copy link
Contributor

bors commented Mar 29, 2020

💔 Test failed - checks-azure

@bors bors 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 Mar 29, 2020
@Dylan-DPC-zz
Copy link
Author

spurious ...

@bors retry

@bors bors 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 Mar 29, 2020
@bors
Copy link
Contributor

bors commented Mar 29, 2020

⌛ Testing commit 800ed0c with merge 699f83f...

@bors
Copy link
Contributor

bors commented Mar 29, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 699f83f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2020
@bors bors merged commit 699f83f into rust-lang:master Mar 29, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-pj86j17 branch April 1, 2020 20:31
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. 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.

7 participants