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

net: be more specific about winapi features #4764

Merged
merged 5 commits into from
Jun 16, 2022
Merged

net: be more specific about winapi features #4764

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e905cf8
net: be more specific about winapi features (#4737)
gftea Jun 11, 2022
76a611d
update feature dependencies according to cargo tree output (#4764)
gftea Jun 13, 2022
ba6f8b2
restore cargo hack changes (#4764)
gftea Jun 13, 2022
cd79703
review update: always enable winapi/std (#4764)
gftea Jun 15, 2022
337cb0c
add winapi/minwindef to net and signal
gftea Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion tokio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ net = [
"mio/os-ext",
"mio/net",
"socket2",
"winapi/fileapi",
"winapi/handleapi",
"winapi/namedpipeapi",
"winapi/winbase",
"winapi/winnt",
gftea marked this conversation as resolved.
Show resolved Hide resolved
"winapi/minwindef",
]
process = [
"bytes",
Expand All @@ -62,7 +67,12 @@ process = [
"mio/os-ext",
"mio/net",
"signal-hook-registry",
"winapi/handleapi",
"winapi/processthreadsapi",
"winapi/threadpoollegacyapiset",
"winapi/winbase",
"winapi/winnt",
"winapi/minwindef",
]
# Includes basic task execution capabilities
rt = ["once_cell"]
Expand All @@ -78,6 +88,8 @@ signal = [
"mio/os-ext",
"signal-hook-registry",
"winapi/consoleapi",
"winapi/wincon",
"winapi/minwindef",
]
sync = []
test-util = ["rt", "sync", "time"]
Expand Down Expand Up @@ -118,7 +130,7 @@ nix = { version = "0.24", default-features = false, features = ["fs", "socket"]
[target.'cfg(windows)'.dependencies.winapi]
version = "0.3.8"
default-features = false
features = ["std", "winsock2", "mswsock", "handleapi", "ws2ipdef", "ws2tcpip"]
gftea marked this conversation as resolved.
Show resolved Hide resolved
features = ["std"]
optional = true

[target.'cfg(windows)'.dev-dependencies.ntapi]
Expand Down