[Merged by Bors] - Use memmap2 instead of memmap, enable rustls on windows, fix typos in openssl api

.github/workflows/ci.yml

@@ -13,6 +13,21 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  test-windows:
+    name: Run tests on Windows
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install ${{ matrix.rust }}
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.rust }}
+          profile: minimal
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.os }}-${{ matrix.check }}
+      - name: Test
+        run: cargo test --features rust_tls
   test:
     name: Check ${{ matrix.check }} on (${{ matrix.os }})
     runs-on: ${{ matrix.os }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-future"
-version = "0.4.5"
+version = "0.4.6"
 edition = "2021"
 authors = ["Fluvio Contributors <[email protected]>"]
 description = "I/O futures for Fluvio project"

src/lib.rs

@@ -32,10 +32,10 @@ pub mod zero_copy;
 #[cfg(feature = "net")]
 pub mod net;
 
-#[cfg(all(unix, feature = "rust_tls"))]
+#[cfg(all(any(unix, windows), feature = "rust_tls"))]
 pub mod rust_tls;
 
-#[cfg(all(unix, feature = "rust_tls", not(feature = "native2_tls")))]
+#[cfg(all(any(unix, windows), feature = "rust_tls", not(feature = "native2_tls")))]
 pub use rust_tls as tls;
 
 #[cfg(all(any(unix, windows), feature = "native2_tls"))]

src/rust_tls.rs

@@ -100,19 +100,17 @@ mod cert {
 }
 
 mod connector {
-
     use std::io::Error as IoError;
 
     use std::io::ErrorKind;
-    use std::os::unix::io::AsRawFd;
-    use std::os::unix::io::RawFd;
 
     use async_rustls::rustls::ServerName;
     use async_trait::async_trait;
     use log::debug;
 
     use crate::net::{
-        BoxReadConnection, BoxWriteConnection, DomainConnector, SplitConnection, TcpDomainConnector,
+        AsConnectionFd, BoxReadConnection, BoxWriteConnection, DomainConnector, SplitConnection,
+        TcpDomainConnector, ConnectionFd,
     };
 
     use super::TcpStream;
@@ -135,9 +133,9 @@ mod connector {
         async fn connect(
             &self,
             domain: &str,
-        ) -> Result<(BoxWriteConnection, BoxReadConnection, RawFd), IoError> {
+        ) -> Result<(BoxWriteConnection, BoxReadConnection, ConnectionFd), IoError> {
             let tcp_stream = TcpStream::connect(domain).await?;
-            let fd = tcp_stream.as_raw_fd();
+            let fd = tcp_stream.as_connection_fd();
             let (write, read) = self
                 .0
                 .connect(
@@ -180,10 +178,10 @@ mod connector {
         async fn connect(
             &self,
             addr: &str,
-        ) -> Result<(BoxWriteConnection, BoxReadConnection, RawFd), IoError> {
+        ) -> Result<(BoxWriteConnection, BoxReadConnection, ConnectionFd), IoError> {
             debug!("connect to tls addr: {}", addr);
             let tcp_stream = TcpStream::connect(addr).await?;
-            let fd = tcp_stream.as_raw_fd();
+            let fd = tcp_stream.as_connection_fd();
             debug!("connect to tls domain: {}", self.domain);
             let (write, read) = self
                 .connector