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

migrate to winapi 0.3 #1322

Merged
merged 1 commit into from
Jan 4, 2018
Merged

migrate to winapi 0.3 #1322

merged 1 commit into from
Jan 4, 2018

Conversation

steffengy
Copy link
Contributor

@steffengy steffengy commented Dec 29, 2017

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 3, 2018

📌 Commit 4ffb8f5 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 3, 2018

⌛ Testing commit 4ffb8f5 with merge af21690...

bors added a commit that referenced this pull request Jan 3, 2018
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
Contributor

bors commented Jan 3, 2018

💔 Test failed - status-appveyor

@bors
Copy link
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
Contributor Author

@alexcrichton rebased

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 4, 2018

📌 Commit a63dc08 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 4, 2018

⌛ Testing commit a63dc08 with merge 341fb00...

bors added a commit that referenced this pull request Jan 4, 2018
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
Contributor

bors commented Jan 4, 2018

💔 Test failed - status-appveyor

@steffengy
Copy link
Contributor Author

steffengy commented Jan 4, 2018

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

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 4, 2018

📌 Commit fc1aa1f has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 4, 2018

⌛ Testing commit fc1aa1f with merge 963982c...

bors added a commit that referenced this pull request Jan 4, 2018
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
Contributor

bors commented Jan 4, 2018

💔 Test failed - status-appveyor

@@ -6,7 +6,9 @@ extern crate rustup;
use std::ffi::CString;
use std::path::PathBuf;
use std::collections::HashMap;
use ::winapi::{HRESULT, PCSTR, UINT, LPCWSTR, LPWSTR, LPVOID};

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

Choose a reason for hiding this comment

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

, ;

@steffengy
Copy link
Contributor Author

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

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 4, 2018

📌 Commit d09ca1c has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jan 4, 2018

⌛ Testing commit d09ca1c with merge de28e51...

bors added a commit that referenced this pull request Jan 4, 2018
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
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants