YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_ws: fix some clippy warnings

Browse source
This commit is contained in:
Joakim Frostegård 2020-08-02 00:07:12 +02:00
parent 8fc09cb130
commit aabdf76a5d
3 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

35
aquatic_ws/src/lib/handler.rs
View file

@ -198,25 +198,24 @@ pub fn handle_announce_requests(
}
// If peer sent answer, send it on to relevant peer
match (request.answer, request.to_peer_id, request.offer_id){
(Some(answer), Some(answer_receiver_id), Some(offer_id)) => {
if let Some(answer_receiver) = torrent_data.peers
.get(&answer_receiver_id)
{
let middleman_answer = MiddlemanAnswerToPeer {
peer_id: request.peer_id,
info_hash: request.info_hash,
answer,
offer_id,
};
if let (Some(answer), Some(answer_receiver_id), Some(offer_id)) =
(request.answer, request.to_peer_id, request.offer_id)
{
if let Some(answer_receiver) = torrent_data.peers
.get(&answer_receiver_id)
{
let middleman_answer = MiddlemanAnswerToPeer {
peer_id: request.peer_id,
info_hash: request.info_hash,
answer,
offer_id,
};
messages_out.push((
answer_receiver.connection_meta,
OutMessage::Answer(middleman_answer)
));
}
},
_ => (),
messages_out.push((
answer_receiver.connection_meta,
OutMessage::Answer(middleman_answer)
));
}
}
let response = OutMessage::AnnounceResponse(AnnounceResponse {

9
aquatic_ws/src/lib/lib.rs
View file

@ -68,11 +68,8 @@ pub fn run(config: Config) -> anyhow::Result<()> {
if let Some(statuses) = socket_worker_statuses.try_lock(){
for opt_status in statuses.iter(){
match opt_status {
Some(Err(err)) => {
return Err(::anyhow::anyhow!(err.to_owned()));
},
_ => {},
if let Some(Err(err)) = opt_status {
return Err(::anyhow::anyhow!(err.to_owned()));
}
}
@ -126,7 +123,7 @@ pub fn create_tls_acceptor(
.context("Couldn't read pkcs12 identity file")?;
let identity = Identity::from_pkcs12(
&mut identity_bytes,
&identity_bytes,
&config.network.tls_pkcs12_password
).context("Couldn't parse pkcs12 identity file")?;

2
aquatic_ws/src/lib/network/connection.rs
View file

@ -222,7 +222,7 @@ impl Connection {
}
#[inline]
pub fn get_established_ws<'a>(&mut self) -> Option<&mut EstablishedWs> {
pub fn get_established_ws(&mut self) -> Option<&mut EstablishedWs> {
match self.inner {
Either::Left(ref mut ews) => Some(ews),
Either::Right(_) => None,