refactor BoxResult

Author: ssrlive

src/client.rs

@@ -30,7 +30,6 @@ use crate::{
 };
 use mio::net::TcpStream;
 use std::{
-    error::Error,
     net::{IpAddr, Shutdown, ToSocketAddrs},
     sync::{
         atomic::{AtomicBool, Ordering},
@@ -41,7 +40,7 @@ use std::{
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 /// when false, the system is shutting down
 static ALIVE: AtomicBool = AtomicBool::new(true);

src/protocol/communication.rs

@@ -24,8 +24,7 @@ use std::time::Duration;
 use mio::net::TcpStream;
 use mio::{Events, Interest, Poll, Token};
 
-use std::error::Error;
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 /// how long to wait for keepalive events
 // the communications channels typically exchange data every second, so 2s is reasonable to avoid excess noise

src/protocol/messaging.rs

@@ -18,8 +18,7 @@
  * along with rperf.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use std::error::Error;
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 /// prepares a message used to tell the server to begin operations
 pub fn prepare_begin() -> serde_json::Value {

src/protocol/results.rs

@@ -23,8 +23,7 @@ use std::time::{SystemTime, UNIX_EPOCH};
 
 use serde::{Deserialize, Serialize};
 
-use std::error::Error;
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 /* This module contains structures used to represent and collect the results of tests.
  * Since everything is basically just a data-container with representation methods,

src/server.rs

@@ -18,7 +18,6 @@
  * along with rperf.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use std::error::Error;
 use std::io;
 use std::net::{Shutdown, SocketAddr};
 use std::sync::atomic::{AtomicBool, AtomicU16, Ordering};
@@ -36,7 +35,7 @@ use crate::protocol::messaging::{prepare_connect, prepare_connect_ready};
 use crate::protocol::results::ServerDoneResult;
 use crate::stream::{tcp, udp, TestStream};
 
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 const POLL_TIMEOUT: Duration = Duration::from_millis(500);
 

src/stream/mod.rs

@@ -21,8 +21,7 @@
 pub mod tcp;
 pub mod udp;
 
-use std::error::Error;
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 pub const INTERVAL: std::time::Duration = std::time::Duration::from_secs(1);
 

src/stream/tcp.rs

@@ -24,8 +24,7 @@ use crate::protocol::results::{get_unix_timestamp, IntervalResult, TcpReceiveRes
 
 use super::{parse_port_spec, TestStream, INTERVAL};
 
-use std::error::Error;
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 pub const TEST_HEADER_SIZE: usize = 16;
 

src/stream/udp.rs

@@ -18,15 +18,13 @@
  * along with rperf.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-use std::error::Error;
-
 use nix::sys::socket::{setsockopt, sockopt::RcvBuf, sockopt::SndBuf};
 
 use crate::protocol::results::{get_unix_timestamp, IntervalResult, UdpReceiveResult, UdpSendResult};
 
 use super::{parse_port_spec, TestStream, INTERVAL};
 
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 pub const TEST_HEADER_SIZE: u16 = 36;
 const UDP_HEADER_SIZE: u16 = 8;

src/utils/cpu_affinity.rs

@@ -18,10 +18,7 @@
  * along with rperf.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-extern crate core_affinity;
-
-use std::error::Error;
-type BoxResult<T> = Result<T, Box<dyn Error>>;
+type BoxResult<T> = Result<T, Box<dyn std::error::Error + Send + Sync + 'static>>;
 
 pub struct CpuAffinityManager {
     enabled_cores: Vec<core_affinity::CoreId>,