Skip to content

migrate to winapi 0.3#1322

Merged
bors merged 1 commit intorust-lang:masterfrom
steffengy:master
Jan 4, 2018
Merged

migrate to winapi 0.3#1322
bors merged 1 commit intorust-lang:masterfrom
steffengy:master

Conversation

@steffengy
Copy link
Copy Markdown
Contributor

@steffengy steffengy commented Dec 29, 2017 •
edited
Loading

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented Jan 3, 2018

@bors: r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 3, 2018

📌 Commit 4ffb8f5 has been approved by alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 3, 2018

⌛ Testing commit 4ffb8f5 with merge af21690...

bors added a commit that referenced this pull request Jan 3, 2018
@bors
Auto merge of #1322 - steffengy:master, r=alexcrichton
af21690 
migrate to winapi 0.3

- [x] Some of those changes should also be applied to cargo, to keep those common files consistent.
filed rust-lang/cargo#4877
@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 3, 2018

💔 Test failed - status-appveyor

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

☔ The latest upstream changes (presumably #1326) made this pull request unmergeable. Please resolve the merge conflicts.

@steffengy steffengy force-pushed the master branch 2 times, most recently from 2c5f9d2 to a63dc08 Compare January 4, 2018 14:52
@steffengy
Copy link
Copy Markdown
Contributor Author

steffengy commented Jan 4, 2018

@alexcrichton rebased

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented Jan 4, 2018

@bors: r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

📌 Commit a63dc08 has been approved by alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

⌛ Testing commit a63dc08 with merge 341fb00...

bors added a commit that referenced this pull request Jan 4, 2018
@bors
Auto merge of #1322 - steffengy:master, r=alexcrichton
341fb00 
migrate to winapi 0.3

- [x] Some of those changes should also be applied to cargo, to keep those common files consistent.
filed rust-lang/cargo#4877
@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

💔 Test failed - status-appveyor

@steffengy
Copy link
Copy Markdown
Contributor Author

steffengy commented Jan 4, 2018 •
edited
Loading

@alexcrichton
Well, seems like I should've checked with cargo check --all-features.
get_msi_product_code now also compiles.

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented Jan 4, 2018

@bors: r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

📌 Commit fc1aa1f has been approved by alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

⌛ Testing commit fc1aa1f with merge 963982c...

bors added a commit that referenced this pull request Jan 4, 2018
@bors
Auto merge of #1322 - steffengy:master, r=alexcrichton
963982c 
migrate to winapi 0.3

- [x] Some of those changes should also be applied to cargo, to keep those common files consistent.
filed rust-lang/cargo#4877
@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

💔 Test failed - status-appveyor

retep998
retep998 reviewed Jan 4, 2018
View reviewed changes
src/rustup-win-installer/src/lib.rs Outdated
use std::collections::HashMap;
use ::winapi::{HRESULT, PCSTR, UINT, LPCWSTR, LPWSTR, LPVOID};

use winapi::shared::ntdef::{HRESULT, PCSTR, LPCWSTR, LPWSTR, ;
Copy link
Copy Markdown
Contributor

@retep998 retep998 Jan 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

, ;

@steffengy
Copy link
Copy Markdown
Contributor Author

steffengy commented Jan 4, 2018

@alexcrichton
Or rather with cargo check --all-features --all. And another hopefully final round, please.

@alexcrichton
Copy link
Copy Markdown
Member

alexcrichton commented Jan 4, 2018

@bors: r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

📌 Commit d09ca1c has been approved by alexcrichton

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

⌛ Testing commit d09ca1c with merge de28e51...

bors added a commit that referenced this pull request Jan 4, 2018
@bors
Auto merge of #1322 - steffengy:master, r=alexcrichton
de28e51 
migrate to winapi 0.3

- [x] Some of those changes should also be applied to cargo, to keep those common files consistent.
filed rust-lang/cargo#4877
@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 4, 2018

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

@bors bors merged commit d09ca1c into rust-lang:master Jan 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@retep998 retep998 retep998 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@steffengy @alexcrichton @bors @retep998
⚡