YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix more clippy warnings

Browse source
This commit is contained in:
Joakim Frostegård 2020-08-02 00:36:56 +02:00
parent aabdf76a5d
commit 561cc3db55
16 changed files with 83 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
aquatic_udp/src/bin/aquatic_udp.rs
View file

@ -1,7 +1,3 @@
use aquatic_udp;
use aquatic_cli_helpers;
#[global_allocator]
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

4
aquatic_udp/src/lib/common.rs
View file

@ -146,8 +146,8 @@ pub struct State {
}
impl State {
pub fn new() -> Self {
impl Default for State {
fn default() -> Self {
Self {
connections: Arc::new(Mutex::new(HashMap::new())),
torrents: Arc::new(Mutex::new(TorrentMaps::default())),

2
aquatic_udp/src/lib/lib.rs
View file

@ -16,7 +16,7 @@ use common::State;
pub fn run(config: Config) -> ::anyhow::Result<()> {
let state = State::new();
let state = State::default();
let (request_sender, request_receiver) = unbounded();
let (response_sender, response_receiver) = unbounded();

43
aquatic_udp/src/lib/network.rs
View file

@ -51,29 +51,27 @@ pub fn run_socket_worker(
for event in events.iter(){
let token = event.token();
if token.0 == token_num {
if event.is_readable(){
read_requests(
&state,
&config,
&mut socket,
&mut buffer,
&mut requests,
&mut local_responses,
);
if (token.0 == token_num) & event.is_readable(){
read_requests(
&state,
&config,
&mut socket,
&mut buffer,
&mut requests,
&mut local_responses,
);
for r in requests.drain(..){
if let Err(err) = request_sender.send(r){
eprintln!("error sending to request_sender: {}", err);
}
for r in requests.drain(..){
if let Err(err) = request_sender.send(r){
eprintln!("error sending to request_sender: {}", err);
}
state.statistics.readable_events.fetch_add(1, Ordering::SeqCst);
poll.registry()
.reregister(&mut socket, token, interests)
.unwrap();
}
state.statistics.readable_events.fetch_add(1, Ordering::SeqCst);
poll.registry()
.reregister(&mut socket, token, interests)
.unwrap();
}
}
@ -102,8 +100,9 @@ fn create_socket(config: &Config) -> ::std::net::UdpSocket {
socket.set_nonblocking(true)
.expect("socket: set nonblocking");
socket.bind(&config.network.address.into())
.expect(&format!("socket: bind to {}", &config.network.address));
socket.bind(&config.network.address.into()).unwrap_or_else(|err|
panic!("socket: bind to {}: {:?}", config.network.address, err)
);
let recv_buffer_size = config.network.socket_recv_buffer_size;