diff --git a/adb_client/src/device/message_writer.rs b/adb_client/src/device/message_writer.rs index e74022a..8345144 100644 --- a/adb_client/src/device/message_writer.rs +++ b/adb_client/src/device/message_writer.rs @@ -35,10 +35,10 @@ impl Write for MessageWriter { Ok(response) => { response .assert_command(MessageCommand::Okay) - .map_err(|e| Error::new(ErrorKind::Other, e))?; + .map_err(Error::other)?; Ok(buf.len()) } - Err(e) => Err(Error::new(ErrorKind::Other, e)), + Err(e) => Err(Error::other(e)), } } diff --git a/adb_client/src/server_device/commands/recv.rs b/adb_client/src/server_device/commands/recv.rs index ec3e372..0b344d8 100644 --- a/adb_client/src/server_device/commands/recv.rs +++ b/adb_client/src/server_device/commands/recv.rs @@ -42,18 +42,15 @@ impl Read for ADBRecvCommandReader { let mut error_msg = vec![0; length]; self.inner.read_exact(&mut error_msg)?; - Err(std::io::Error::new( - std::io::ErrorKind::Other, - format!( - "ADB request failed: {}", - String::from_utf8_lossy(&error_msg) - ), - )) + Err(std::io::Error::other(format!( + "ADB request failed: {}", + String::from_utf8_lossy(&error_msg) + ))) } - _ => Err(std::io::Error::new( - std::io::ErrorKind::Other, - format!("Unknown response from device {:#?}", header), - )), + _ => Err(std::io::Error::other(format!( + "Unknown response from device {:#?}", + header + ))), } } else { // Computing minimum to ensure to stop reading before next header...