Skip to content

Rollup of 6 pull requests - #60877

Merged
bors merged 19 commits into
rust-lang:masterfrom
Centril:rollup-j0o5mo5
May 16, 2019
Merged

Rollup of 6 pull requests#60877
bors merged 19 commits into
rust-lang:masterfrom
Centril:rollup-j0o5mo5

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

jsgfand others added 19 commits April 9, 2019 16:52
Allow Strings to be created from borrowed Strings. This is mostly
to make things like passing &String to an `impl Into<String>`
parameter frictionless.
LLVM will soon require 2017+ [1] (and our in-tree version just rejected the version of 2015 I was using), so update the mention and provide a link.
[1]: https://llvm.org/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library
string: implement From<&String> for String
Allow Strings to be created from borrowed Strings. This is mostly
to make things like passing `&String` to an `impl Into<String>`
parameter frictionless.
Fixesrust-lang#59827.
…teveklabnik
Fix convert module's documentation links
r? @steveklabnik
…tril
Include expression to wait for to the span of Await
Currently the span of `await!` only includes itself:
```rust
await!(3);
// ^^^^^
```
This PR changes it so that the span holds the whole `await!` expression:
```rust
await!(3);
// ^^^^^^^^^
Update rustc book CLI docs.
This adds a little detail (and missing flags) to the rustc book. There is still a lot of information missing, but this seemed like a good step to expanding it.
…crichton
README.md: Mention MSVC 2017+, not 2013(!)
LLVM will soon require 2017+ (and our in-tree version just rejected the version of 2015 I was using), so update the mention and provide a link.
Ref: https://llvm.org/docs/GettingStarted.html#host-c-toolchain-both-compiler-and-standard-library
Move `box` from the stable keyword to unstable keywords list
Fixesrust-lang#60849
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=6 rollup=never

@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit b59ce94 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 16, 2019
@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b59ce94 with merge 1962ade...

bors added a commit that referenced this pull request May 16, 2019
Rollup of 6 pull requests
Successful merges:
- #59825 (string: implement From<&String> for String)
- #59923 (Fix convert module's documentation links)
- #60691 (Include expression to wait for to the span of Await)
- #60769 (Update rustc book CLI docs.)
- #60816 (README.md: Mention MSVC 2017+, not 2013(!))
- #60851 (Move `box` from the stable keyword to unstable keywords list)
Failed merges:
r? @ghost
@bors

bors commented May 16, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 1962ade to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 16, 2019
@bors
bors merged commit b59ce94 into rust-lang:masterMay 16, 2019
@Centril
Centril deleted the rollup-j0o5mo5 branch May 16, 2019 13:00
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

8 participants

@Centril@bors@jsgf@czipperz@topecongiro@ehuss@scottmcm@Pulkit07