Skip to content

Commit aee34a3

Browse files
committed
move mio utils crates to conflux-chain org
1 parent 2b76ae0 commit aee34a3

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ async-trait = "0.1"
325325
tower = "0.4"
326326
pin-project = "1.0"
327327
mio = { version = "1.0.4", features = ["os-ext", "net", "os-poll"] }
328-
mio-timer = { git = "https://github.com/Pana/mio-timer", rev = "251170b" }
329-
mio-misc = { git = "https://github.com/Pana/mio-misc", rev = "27ad80f" }
328+
mio-timer = { git = "https://github.com/Conflux-Chain/mio-timer", rev = "91a02cc" }
329+
mio-misc = { git = "https://github.com/Conflux-Chain/mio-misc", rev = "27ad80f" }
330330
reqwest = "0.12"
331331

332332
# crypto & hash

crates/network/src/connection.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,7 @@ impl Connection {
387387
recv_buf: BytesMut::new(),
388388
send_queue: PrioritySendQueue::default(),
389389
sending_packet: None,
390-
interest: Interest::READABLE, /* previously(mio0.6) use
391-
* Ready::hup() |
392-
* Ready::readable(), Ready::hub()
393-
* is removed from 0.7 */
390+
interest: Interest::READABLE,
394391
registered: AtomicBool::new(false),
395392
assembler: Box::new(PacketWithLenAssembler::default()),
396393
}

crates/network/src/service.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
17721772
.register(
17731773
&mut *self.tcp_listener.lock(),
17741774
Token(TCP_ACCEPT),
1775-
Interest::READABLE | Interest::WRITABLE, // previously(mio0.6) Ready::all() is used here
1775+
Interest::READABLE | Interest::WRITABLE,
17761776
)
17771777
.expect("Error registering stream");
17781778
}
@@ -1781,7 +1781,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
17811781
.register(
17821782
&mut *self.udp_socket.lock(),
17831783
reg,
1784-
Interest::READABLE | Interest::WRITABLE, // previously(mio0.6) Ready::all() is used here
1784+
Interest::READABLE | Interest::WRITABLE,
17851785
)
17861786
.expect("Error registering UDP socket");
17871787
}
@@ -1828,7 +1828,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
18281828
.reregister(
18291829
&mut *self.tcp_listener.lock(),
18301830
Token(TCP_ACCEPT),
1831-
Interest::READABLE | Interest::WRITABLE, // previously(mio0.6) Ready::all() is used here
1831+
Interest::READABLE | Interest::WRITABLE,
18321832
)
18331833
.expect("Error reregistering stream"),
18341834
UDP_MESSAGE => {
@@ -1841,11 +1841,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
18411841
Interest::READABLE
18421842
};
18431843
poll_registry
1844-
.reregister(
1845-
&mut *udp_socket,
1846-
reg,
1847-
registration,
1848-
)
1844+
.reregister(&mut *udp_socket, reg, registration)
18491845
.expect("Error reregistering UDP socket");
18501846
}
18511847
_ => warn!("Unexpected stream update"),

crates/util/io/src/mio_util/io.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Re-export the io::Result / Error types for convenience
22
pub use std::io::{Error, ErrorKind, Read, Result, Write};
33

4-
// TODO: Delete this
54
/// A helper trait to provide the map_non_block function on Results.
65
pub trait MapNonBlock<T> {
76
/// Maps a `Result<T>` to a `Result<Option<T>>` by converting

tools/consensus_bench/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/evm-spec-tester/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)