Skip to content

Rollup of 7 pull requests - #51965

Closed
emilyalbini wants to merge 15 commits into
rust-lang:masterfrom
emilyalbini:rollup
Closed

Rollup of 7 pull requests#51965
emilyalbini wants to merge 15 commits into
rust-lang:masterfrom
emilyalbini:rollup

Conversation

@emilyalbini

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

Centriland others added 15 commits June 11, 2018 23:10
to not shadow the system installed LLD when linking with LLD.
Before:
- `-C linker=lld -Z linker-flavor=ld.lld` uses rustc's LLD
- It's not possible to use a system installed LLD that's named `lld`
With this commit:
- `-C linker=rust-lld -Z linker-flavor=ld.lld` uses rustc's LLD
- `-C linker=lld -Z linker-flavor=ld.lld` uses the system installed LLD
…flatten, r=SimonSapin
Stabilize Iterator::flatten in 1.29, fixesrust-lang#48213.
This PR stabilizes [`Iterator::flatten`](https://doc.rust-lang.org/nightly/std/iter/trait.Iterator.html#method.flatten) in *version 1.29* (1.28 goes to beta in 10 days, I don't think there's enough time to land it in that time, but let's see...).
Tracking issue is: rust-lang#48213.
cc @bluss re. itertools.
r? @SimonSapin
ping @pietroalbini -- let's do a crater run when this passes CI :)
…mertj
Fix some doc links
The futures crate CI always fails because of these intra doc links. I hope that this will fix this issue.
r? @steveklabnik@cramertj
Edit: I added @steveklabnik as reviewer because this PR also adjusts a link in `src/libstd/error.rs`
Fix inconsequential typo in GlobalAlloc doc example
…estebank
use literal span for concrete type suggestion
Fixesrust-lang#51874.
r? @estebank
…richton
rename the llvm-tools component to llvm-tools-preview and tweak its image
as per rust-lang#49584 (comment)
r? @alexcrichton or @Mark-Simulacrum
rename rustc's lld to rust-lld
to not shadow the system installed LLD when linking with LLD.
Before:
- `-C linker=lld -Z linker-flavor=ld.lld` uses rustc's LLD
- It's not possible to use a system installed LLD that's named `lld`
With this commit:
- `-C linker=rust-lld -Z linker-flavor=ld.lld` uses rustc's LLD
- `-C linker=lld -Z linker-flavor=ld.lld` uses the system installed LLD
we don't offer guarantees about the availability of LLD in the rustc sysroot so we can rename the tool as long as we don't break the wasm32-unknown-unknown target which depends on it.
r? @alexcrichton we discussed this before
Fix typo in /src/librustc_resolve/lib.rs
absoluate -> absolute
@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=7

@bors

bors commented Jul 1, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 459b6d5 has been approved by pietroalbini

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

bors commented Jul 1, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 459b6d5 with merge d595db5...

bors added a commit that referenced this pull request Jul 1, 2018
Rollup of 7 pull requests
Successful merges:
- #51511 (Stabilize Iterator::flatten in 1.29, fixes#48213.)
- #51853 (Fix some doc links)
- #51890 (Fix inconsequential typo in GlobalAlloc doc example)
- #51920 (use literal span for concrete type suggestion)
- #51922 (rename the llvm-tools component to llvm-tools-preview and tweak its image)
- #51936 (rename rustc's lld to rust-lld)
- #51961 (Fix typo in /src/librustc_resolve/lib.rs)
Failed merges:
r? @ghost
@bors

bors commented Jul 1, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@borsbors 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 Jul 1, 2018
@emilyalbini
emilyalbini deleted the rollup branch July 1, 2018 18:48
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Tracking issue for Iterator::flatten

8 participants

@emilyalbini@bors@Centril@MajorBreakfast@Ixrec@euclio@japaric@11Takanori