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 6 pull requests #69570

Merged
merged 13 commits into from
Feb 29, 2020
Merged

Rollup of 6 pull requests #69570

merged 13 commits into from
Feb 29, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

MichaelMcDonnell and others added 13 commits February 26, 2020 17:34
The hash tests were written before the assert_ne macro was added to the standard library. The assert_ne macro provides better output in case of a failure.
The current check for wether a target is no_std or not is matching for the
string "-none-" in a target triple. This doesn't work for triples that end in
"-none", like "aarch64-unknown-none".

Fix this by matching for "-none" instead.

I checked for all the current target triples containing "none", and this should
not generate any false positives.

This fixes an issue encountered in rust-lang#68334
docs: add mention of async blocks in move keyword docs

Fixes rust-lang#69298
…LukasKalbertodt

Use assert_ne in hash tests

The hash tests were written before the assert_ne macro was added to the standard library. The assert_ne macro provides better output in case of a failure.
…wco,nagisa

use to_vec() instead of .iter().cloned().collect() to convert slices to vecs.
…acrum

use is_empty() instead of len() == x  to determine if structs are empty.
…ark-Simulacrum

Fix no_std detection for target triples

The current check for wether a target is no_std or not is matching for the string `-none-` in a target triple. This doesn't work for triples that end in `-none`, like `aarch64-unknown-none`.

Fix this by matching for `-none` instead.

I checked for all the current target triples containing `none`, and this should not generate any false positives.

This fixes an issue encountered in rust-lang#68334
use .to_string() instead of format!() macro to create strings

handles what is left after rust-lang#69541
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Feb 29, 2020

📌 Commit bbfec7c 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 Feb 29, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Feb 29, 2020
@bors
Copy link
Contributor

bors commented Feb 29, 2020

⌛ Testing commit bbfec7c with merge 3118685573a2f674f5b64d431a0f2a06ec20b1e1...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Feb 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 Feb 29, 2020
@JohnTitor
Copy link
Member

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

bors commented Feb 29, 2020

⌛ Testing commit bbfec7c with merge 3f9bddc...

@bors
Copy link
Contributor

bors commented Feb 29, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 29, 2020
@bors bors merged commit 3f9bddc into rust-lang:master Feb 29, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #69570!

Tested on commit 3f9bddc.
Direct link to PR: #69570

💔 rls on linux: test-pass → test-fail (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 29, 2020
Tested on commit rust-lang/rust@3f9bddc.
Direct link to PR: <rust-lang/rust#69570>

💔 rls on linux: test-pass → test-fail (cc @Xanewok).
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.

9 participants