Skip to content

Commit

Permalink
Auto merge of #23449 - Eijebong:winapi, r=jdm
Browse files Browse the repository at this point in the history
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 -->
  • Loading branch information
bors-servo committed May 25, 2019
2 parents df882a7 + 3e7a9a0 commit 1c74a80
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 65 deletions.
103 changes: 39 additions & 64 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Cargo.toml
Expand Up @@ -24,3 +24,7 @@ opt-level = 3
#
# [patch."https://github.com/servo/<repository>"]
# <crate> = { path = "/path/to/local/checkout" }

# Those are here to dedupe winapi since mio is still using winapi 0.2.
mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
iovec = { git = "https://github.com/servo/iovec.git", branch = "servo" }
1 change: 0 additions & 1 deletion servo-tidy.toml
Expand Up @@ -42,7 +42,6 @@ packages = [
"generic-array",
"rand",
"unicase",
"winapi",
]
# Files that are ignored for all tidy and lint checks.
files = [
Expand Down

0 comments on commit 1c74a80

Please sign in to comment.