Nightly Format and Windows compile fix

Author: abezukor

src/android/l2cap_channel.rs

@@ -1,11 +1,7 @@
-use std::{
-    fmt,
-    io::Result,
-    pin::Pin,
-    slice,
-    task::{Context, Poll},
-    thread,
-};
+use std::io::Result;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::{fmt, slice, thread};
 
 use java_spaghetti::{ByteArray, Global, Local, PrimitiveArray};
 use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, DuplexStream, ReadBuf};

src/bluer/l2cap_channel.rs

@@ -1,8 +1,6 @@
-use std::{
-    io::Result,
-    pin::Pin,
-    task::{Context, Poll},
-};
+use std::io::Result;
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
 use bluer::l2cap::{SocketAddr, Stream};
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};

src/corebluetooth/device.rs

@@ -6,15 +6,14 @@ use objc_foundation::{INSArray, INSFastEnumeration, INSString, NSArray};
 use objc_id::ShareId;
 
 use super::delegates::{PeripheralDelegate, PeripheralEvent};
+#[cfg(feature = "l2cap")]
+use super::l2cap_channel::Channel;
 use super::types::{CBPeripheral, CBPeripheralState, CBService, CBUUID};
 use crate::device::ServicesChanged;
 use crate::error::ErrorKind;
 use crate::pairing::PairingAgent;
 use crate::{Device, DeviceId, Error, Result, Service, Uuid};
 
-#[cfg(feature = "l2cap")]
-use super::l2cap_channel::Channel;
-
 /// A Bluetooth LE device
 #[derive(Clone)]
 pub struct DeviceImpl {

src/corebluetooth/l2cap_channel.rs

@@ -1,19 +1,16 @@
-use std::{
-    io::Result,
-    os::fd::{FromRawFd, RawFd},
-    pin::Pin,
-    task::{Context, Poll},
-};
+use std::io::Result;
+use std::os::fd::{FromRawFd, RawFd};
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
 use objc_foundation::INSData;
 use objc_id::{Id, Shared};
-use tokio::{
-    io::{AsyncRead, AsyncWrite, ReadBuf},
-    net::UnixStream,
-};
+use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
+use tokio::net::UnixStream;
 
 use super::types::{kCFStreamPropertySocketNativeHandle, CBL2CAPChannel, CFStream};
-use crate::{error::ErrorKind, Error};
+use crate::error::ErrorKind;
+use crate::Error;
 
 // This implementation is based upon the fact that that CBL2CAPChannel::outputStream -> an NS Output Stream; (https://developer.apple.com/documentation/foundation/outputstream)
 // NS Output stream is toll free bridged to CFWriteStream (https://developer.apple.com/documentation/corefoundation/cfwritestream)

src/device.rs

@@ -4,11 +4,10 @@ use futures_core::Stream;
 use futures_lite::StreamExt;
 
 use crate::error::ErrorKind;
-use crate::pairing::PairingAgent;
-use crate::{sys, DeviceId, Error, Result, Service, Uuid};
-
 #[cfg(feature = "l2cap")]
 use crate::l2cap_channel::L2capChannel;
+use crate::pairing::PairingAgent;
+use crate::{sys, DeviceId, Error, Result, Service, Uuid};
 
 /// A Bluetooth LE device
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]

src/l2cap_channel.rs

@@ -1,8 +1,6 @@
-use std::{
-    io::Result,
-    pin::Pin,
-    task::{Context, Poll},
-};
+use std::io::Result;
+use std::pin::Pin;
+use std::task::{Context, Poll};
 
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 

src/windows/device.rs

@@ -273,6 +273,7 @@ impl DeviceImpl {
         Err(ErrorKind::NotSupported.into())
     }
 
+    #[cfg(feature = "l2cap")]
     pub async fn open_l2cap_channel(
         &self,
         _psm: u16,

src/windows/l2cap_channel.rs

@@ -2,51 +2,24 @@ use std::fmt;
 
 use crate::Result;
 
-pub struct L2capChannelReader {
-    _private: (),
-}
-
-impl L2capChannelReader {
-    #[inline]
-    pub async fn read(&mut self, _buf: &mut [u8]) -> Result<usize> {
-        todo!()
-    }
+pub struct Channel {}
 
-    pub fn try_read(&mut self, _buf: &mut [u8]) -> Result<usize> {
-        todo!()
-    }
-
-    pub async fn close(&mut self) -> Result<()> {
-        todo!()
+impl AsyncRead for Channel {
+    fn poll_read(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &mut ReadBuf<'_>) -> Poll<std::io::Result<()>> {
+        unimplemented!()
     }
 }
 
-impl fmt::Debug for L2capChannelReader {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("L2capChannelReader")
+impl AsyncWrite for Channel {
+    fn poll_write(mut self: Pin<&mut Self>, cx: &mut Context<'_>, buf: &[u8]) -> Poll<Result<usize>> {
+        unimplemented!()
     }
-}
 
-pub struct L2capChannelWriter {
-    _private: (),
-}
-
-impl L2capChannelWriter {
-    pub async fn write(&mut self, _packet: &[u8]) -> Result<()> {
-        todo!()
-    }
-
-    pub fn try_write(&mut self, _packet: &[u8]) -> Result<()> {
-        todo!()
+    fn poll_flush(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
+        unimplemented!()
     }
 
-    pub async fn close(&mut self) -> Result<()> {
-        todo!()
-    }
-}
-
-impl fmt::Debug for L2capChannelWriter {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str("L2capChannelWriter")
+    fn poll_shutdown(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<()>> {
+        unimplemented!()
     }
 }