Merge branch 'master' of ssh://git.methanium.net/methanium/mtp
All checks were successful
CI / checks (push) Successful in 5m56s
All checks were successful
CI / checks (push) Successful in 5m56s
This commit is contained in:
commit
590810ce59
10 changed files with 195 additions and 158 deletions
|
|
@ -1,7 +1,10 @@
|
|||
#[cfg(not(feature = "crypto"))]
|
||||
use mtp_codec::{Version, registry::{Registry, VersionedCodec}};
|
||||
#[cfg(feature = "crypto")]
|
||||
use mtp_codec::registry::Registry;
|
||||
#[cfg(not(feature = "crypto"))]
|
||||
use mtp_codec::{
|
||||
Version,
|
||||
registry::{Registry, VersionedCodec},
|
||||
};
|
||||
use mtp_transport::{Receiver, Sender};
|
||||
use std::sync::Arc;
|
||||
use std::time::Instant;
|
||||
|
|
@ -136,9 +139,7 @@ impl HandshakeContext {
|
|||
#[cfg(feature = "crypto")]
|
||||
{
|
||||
Ok(Some(self.connection_from_handshake_result(
|
||||
sender,
|
||||
receiver,
|
||||
result,
|
||||
sender, receiver, result,
|
||||
)))
|
||||
}
|
||||
#[cfg(not(feature = "crypto"))]
|
||||
|
|
|
|||
Loading…
Reference in a new issue