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

Merged
merged 10 commits into from
Jan 5, 2020
Merged

Rollup of 5 pull requests #67903

merged 10 commits into from
Jan 5, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

ollie27 and others added 10 commits January 4, 2020 18:42
`make_test` is also called when parsing codeblocks for the playground links so it should handle unwinds from the parser internally.
It hasn't been UB to pass negative numbers to sqrt since https://reviews.llvm.org/D28797 which was included in LLVM 5.
…rror, r=GuillaumeGomez

rustdoc: Avoid panic when parsing codeblocks for playground links

`make_test` is also called when parsing codeblocks for the playground links so it should handle unwinds from the parser internally.

Fixes rust-lang#63016

r? @GuillaumeGomez
Remove negative number check from float sqrt

It hasn't been UB to pass negative numbers to sqrt since https://reviews.llvm.org/D28797 which was included in LLVM 5.
…entril

Add backticks to various diagnostics
remove bespoke flock bindings

Replaces some `struct flock` definitions with the definition from `libc`.
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 5, 2020
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 5, 2020

📌 Commit b9160fb 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 Jan 5, 2020
@bors
Copy link
Contributor

bors commented Jan 5, 2020

⌛ Testing commit b9160fb with merge bc1571c...

bors added a commit that referenced this pull request Jan 5, 2020
Rollup of 5 pull requests

Successful merges:

 - #67818 (rustdoc: Avoid panic when parsing codeblocks for playground links)
 - #67845 (Also remove const-hack for abs)
 - #67879 (Remove negative number check from float sqrt)
 - #67881 (Add backticks to various diagnostics)
 - #67882 (remove bespoke flock bindings)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 5, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 5, 2020
@bors bors merged commit b9160fb into rust-lang:master Jan 5, 2020
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.

7 participants