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.

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

Rollup of 5 pull requests #39787

Merged
merged 14 commits into from
Feb 13, 2017
Merged

Rollup of 5 pull requests #39787

merged 14 commits into from
Feb 13, 2017

Conversation

frewsxcv
Copy link
Member

Charlie Fan and others added 14 commits February 11, 2017 13:08
@F001
Add swap method for Cell
a5e8bbf
@binarycrusader
Add Solaris as recognized ostype
ee54be3 
Add cputype recognition for Solaris

Fixes rust-lang#39729
@binarycrusader
fix copy pasta
33b655e 
Don't need to catch WindowsError.  That was very silly of me.
@binarycrusader
fix exception handling for isainfo execution failure
4a618fe 
remove unnecessary gcc_s addition in libstd for Solaris
@binarycrusader
fix portability issue in error handling of build_triple
3807e1f
@frewsxcv
Remove '--disable-rustbuild' option from configure script.
6194a76 
Fixes rust-lang#39762.
@king6cong
typo fix
8443c1e
@shepmaster
Remove duplicated "parameter" in E0089 text
79d32e9 
Closes rust-lang#39732
@shepmaster
Standardize lifetime and type parameter count mismatch errors
1c99841 
They now always say how many lifetime / type parameters were expected
and are explicit about stating "lifetime" or "type" instead of just
"parameter".
@frewsxcv
Rollup merge of rust-lang#39716 - F001:swapCell, r=alexcrichton
5b79f33 
Add `swap` method for `Cell`

Addition to rust-lang#39264

r? @alexcrichton
@frewsxcv
Rollup merge of rust-lang#39758 - shepmaster:e0089-duplicate-text, r=…
4148711 
…GuillaumeGomez

Remove duplicated "parameter" in E0089 text

Closes rust-lang#39732
@frewsxcv
Rollup merge of rust-lang#39759 - binarycrusader:master, r=alexcrichton
1871bff 
add solaris rustbuild support

Add Solaris as recognized ostype
Add cputype recognition for Solaris

Fixes rust-lang#39729

A future pull request will discriminate between the commercial release and older opensource derivatives to account for divergence, for now, this is compatible with both.
@frewsxcv
Rollup merge of rust-lang#39774 - frewsxcv:no-rustbuild, r=alexcrichton
e9abf4b 
Remove '--disable-rustbuild' option from configure script.

Fixes rust-lang#39762.
@frewsxcv
Rollup merge of rust-lang#39784 - king6cong:master, r=GuillaumeGomez
2a030bf 
typo fix
@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 @brson (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

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Feb 13, 2017

📌 Commit 2a030bf has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Feb 13, 2017

⌛ Testing commit 2a030bf with merge 779c86e...

@steveklabnik
Copy link
Member

@bors: retry

(sorry, i really need #39728 to land, let's do this after that)

@bors
Copy link
Contributor

bors commented Feb 13, 2017

⌛ Testing commit 2a030bf with merge 54b5bdb...

@bors
Copy link
Contributor

bors commented Feb 13, 2017

💔 Test failed - status-appveyor

@frewsxcv
Copy link
Member Author

@bors retry

error: RPC failed; curl 56 SSL read: error:00000000:lib(0):func(0):reason(0), errno 104
fatal: The remote end hung up unexpectedly
fatal: early EOF
fatal: index-pack failed
fatal: clone of 'https://github.com/rust-lang/llvm.git' into submodule path 'src/llvm' failed

@bors
Copy link
Contributor

bors commented Feb 13, 2017

⌛ Testing commit 2a030bf with merge 0af0b58...

bors added a commit that referenced this pull request Feb 13, 2017
@bors
Auto merge of #39787 - frewsxcv:rollup, r=frewsxcv
0af0b58 
Rollup of 5 pull requests

- Successful merges: #39716, #39758, #39759, #39774, #39784
- Failed merges:
@bors
Copy link
Contributor

bors commented Feb 13, 2017

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

@bors bors merged commit 2a030bf into rust-lang:master Feb 13, 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
No one assigned
Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@frewsxcv @rust-highfive @bors @steveklabnik @brson @Centril @binarycrusader @king6cong @shepmaster