Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upDedupe winapi #23449
Dedupe winapi #23449
Conversation
|
@bors-servo try |
WIP: Dedupe winapi <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23449) <!-- Reviewable:end -->
|
Tidy failed because winapi isn't duped anymore |
| @@ -24,3 +24,5 @@ opt-level = 3 | |||
| # | |||
| # [patch."https://github.com/servo/<repository>"] | |||
| # <crate> = { path = "/path/to/local/checkout" } | |||
| mio = { git = "https://github.com/servo/mio.git", branch = "servo" } | |||
| iovec = { git = "https://github.com/servo/iovec.git", branch = "servo" } | |||
This comment has been minimized.
This comment has been minimized.
SimonSapin
May 24, 2019
Member
Forking two repositories is unfortunate. What’s the plan to unfork? Are there PRs waiting to be merged upstream?
This comment has been minimized.
This comment has been minimized.
Eijebong
May 24, 2019
Author
Member
As soon as mio get a new release and is updated in tokio we can unfork those.
The master branches of mio and iovec already contain the patches but also other breaking changes so we can't use them directly. Mio had promised a new release more than one year ago so hopefully it'll come soon...
The duplication of was blocking @paulrouget on some work hence the forking
This comment has been minimized.
This comment has been minimized.
SimonSapin
May 24, 2019
Member
Sounds reasonable, thanks. Could you add a comment in Cargo.toml that explains this winapi situation? r=me with that.
This comment has been minimized.
This comment has been minimized.
Since mio still hasn't been released, this uses custom forks with just winapi bumped to 0.3 in them.
|
@bors-servo treeclosed=9000 |
|
@bors-servo treeclosed- |
|
@bors-servo r+ |
|
|
Dedupe winapi <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23449) <!-- Reviewable:end -->
|
|
|
@bors-servo retry
|
Dedupe winapi <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23449) <!-- Reviewable:end -->
|
|
Eijebong commentedMay 23, 2019
•
edited by SimonSapin
This change is