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

Jump to bottom

upgrade: tokio 1.0 #8779

Merged
merged 22 commits into from
Jan 12, 2021
Merged

upgrade: tokio 1.0 #8779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift click to select a range
98380c5
upgrade to tokio 0.3
bartlomieju Dec 16, 2020
01523a2
fix whitespace
bartlomieju Dec 16, 2020
10a2983
use tokio 0.2 for test server
bartlomieju Dec 16, 2020
c28197d
try debug
bartlomieju Dec 16, 2020
91c7620
remove flush
bartlomieju Dec 16, 2020
7e05160
Merge branch 'master' into tokio_03
bartlomieju Dec 23, 2020
f980e66
tokio 1.0
bartlomieju Dec 23, 2020
ff4bb7a
Merge branch 'master' into tokio_03
bartlomieju Jan 9, 2021
575a124
fix
bartlomieju Jan 9, 2021
be45286
fix2
bartlomieju Jan 9, 2021
54e6e9e
bump
bartlomieju Jan 9, 2021
9a07d51
Merge branch 'master' into tokio_03
bartlomieju Jan 10, 2021
ca8fbab
fix cargo.lock
bartlomieju Jan 10, 2021
6edb6cb
Merge branch 'master' into tokio_03
bartlomieju Jan 10, 2021
5a984c2
fix after merge
bartlomieju Jan 10, 2021
03db65a
Merge branch 'master' into tokio_03
bartlomieju Jan 11, 2021
9d8d3bd
revert test
bartlomieju Jan 11, 2021
e1bea90
Merge remote-tracking branch 'origin/master' into tokio_03
piscisaureus Jan 12, 2021
e3f6d73
❤️→💚
piscisaureus Jan 12, 2021
c78302c
clean up
piscisaureus Jan 12, 2021
022451a
clean up more
piscisaureus Jan 12, 2021
4ea8328
Upgrade crates
piscisaureus Jan 12, 2021
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
Prev Previous commit
Next Next commit
❤️→💚
  • Loading branch information
@piscisaureus
piscisaureus committed Jan 12, 2021
commit e3f6d73e102780b1b9d1c6b901066610e23f79d7
2 changes: 2 additions & 0 deletions runtime/ops/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 434,7 @@ fn listen_tcp(
addr: SocketAddr,
) -> Result<(u32, SocketAddr), AnyError> {
let std_listener = std::net::TcpListener::bind(&addr)?;
std_listener.set_nonblocking(true)?;
let listener = TcpListener::from_std(std_listener)?;
let local_addr = listener.local_addr()?;
let listener_resource = TcpListenerResource {
Expand All @@ -450,6 451,7 @@ fn listen_udp(
addr: SocketAddr,
) -> Result<(u32, SocketAddr), AnyError> {
let std_socket = std::net::UdpSocket::bind(&addr)?;
std_socket.set_nonblocking(true)?;
let socket = UdpSocket::from_std(std_socket)?;
let local_addr = socket.local_addr()?;
let socket_resource = UdpSocketResource {
Expand Down
1 change: 1 addition & 0 deletions runtime/ops/tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 303,7 @@ fn op_listen_tls(
.next()
.ok_or_else(|| generic_error("No resolved address found"))?;
let std_listener = std::net::TcpListener::bind(&addr)?;
std_listener.set_nonblocking(true)?;
let listener = TcpListener::from_std(std_listener)?;
let local_addr = listener.local_addr()?;
let tls_listener_resource = TlsListenerResource {
Expand Down