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

Merged
merged 21 commits into from
May 4, 2017
Merged

Rollup of 6 pull requests #41735

merged 21 commits into from
May 4, 2017

Conversation

ranma42 and others added 21 commits April 25, 2017 16:08
instead of combining the component and target into a URL.
The same unavailable target value is used in two different places.
Abstracting it makes it easier to update it and recognise its purpose.
MacOSX does not ship `7z` nor `xz`. Let's use `xz`, just like on the
other *nix systems.
Wrap the installation on macOS with `travis_retry`.
Generate XZ-compressed tarballs

Integrate the new `rust-installer` and extend manifests with keys for xz-compressed tarballs.

One of the steps required for rust-lang#21724
Fix @martinhath's mailmap entry

I stumbled upon a name duplication issue in [rust-lang-nursery/thanks](https://github.com/rust-lang-nursery/thanks/), and realized that this problem is easily fixable. I've (hopefully) done the right thing here. It works locally (`git shortlog | grep "Thoresen"` only returns one entry instead of two).

I didn't bother creating an issue in the `thanks` repository, since I did the `.mailmap` editing myself.
…teveklabnik

Improvements to `std::time::Duration` doc examples.

Opened primarily for the last commit, in response to comments in rust-lang#39949.
…eveklabnik

Update ChildStdin/ChildStdout docs to be clearer

This is part of rust-lang#29370 and continues the work from rust-lang#40829
Document the reasoning for the Acquire/Release handshake when dropping Arcs.

Split out from rust-lang#41714. r? @aturon
@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (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.

@frewsxcv
Copy link
Member Author

frewsxcv commented May 3, 2017

@bors r+ p=10

@bors
Copy link
Contributor

bors commented May 3, 2017

📌 Commit e20b282 has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented May 3, 2017

⌛ Testing commit e20b282 with merge b16c7a2...

bors added a commit that referenced this pull request May 3, 2017
Rollup of 6 pull requests

- Successful merges: #41543, #41600, #41715, #41720, #41721, #41730
- Failed merges:
@bors
Copy link
Contributor

bors commented May 4, 2017

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

@bors bors merged commit e20b282 into rust-lang:master May 4, 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
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants