Skip to content

[beta] Rollup of 2 pull requests #41406

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Apr 20, 2017
Merged

[beta] Rollup of 2 pull requests #41406

merged 4 commits into from
Apr 20, 2017

Conversation

frewsxcv
Copy link
Contributor

steveklabnik and others added 4 commits April 18, 2017 10:15
@steveklabnik
Fix link to book repo
1605636
@petrhosek @alexcrichton
travis: Use upstream LLVM repositories for Fuchsia
f5cc0de 
The Fuchsia copies of LLVM repositories contain additional patches
for work-in-progress features and there is some amount of churn that
may break Rust. Use upstream LLVM repositories instead for building
the toolchain used by the Fuchsia builder.
@frewsxcv
Rollup merge of rust-lang#41365 - rust-lang:steveklabnik-patch-1, r=a…
e2227a0 
…lexcrichton

[beta] Fix link to book repo

This is a backport to beta, to be clear. I don't think we *have* to take this, but opened this PR to see if we should consider it to save six weeks of breakage.

Due to extracting the book out into its own repo, this link is broken. This fixes it to point to the right place. This was originally filed as rust-lang/book#633.
@frewsxcv
Rollup merge of rust-lang#41397 - alexcrichton:beta-next, r=aidanhs
afa2587 
[beta] travis: Use upstream LLVM repositories for Fuchsia

This is a backport of rust-lang#41130 which...

Closes rust-lang#41396
@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive
Copy link
Contributor

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@frewsxcv
Copy link
Contributor Author

@bors r+ p=20

@bors
Copy link
Collaborator

bors commented Apr 19, 2017

📌 Commit afa2587 has been approved by frewsxcv

@frewsxcv frewsxcv changed the title Rollup of 2 pull requests [beta] Rollup of 2 pull requests Apr 19, 2017
@bors
Copy link
Collaborator

bors commented Apr 19, 2017

⌛ Testing commit afa2587 with merge e64b987...

bors added a commit that referenced this pull request Apr 19, 2017
@bors
Auto merge of #41406 - frewsxcv:rollup, r=frewsxcv
e64b987 
[beta] Rollup of 2 pull requests

- Successful merges: #41365, #41397
- Failed merges:
@bors
Copy link
Collaborator

bors commented Apr 20, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing e64b987 to beta...

@bors bors merged commit afa2587 into rust-lang:beta Apr 20, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@frewsxcv @rust-highfive @bors @aturon @Centril @steveklabnik @petrhosek