[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-rustls:
+    name: Run tests on Windows with rustls
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: windows-latest-rustls-test
+      - name: Test
+        run: cargo test --features rust_tls
   test:
     name: Check ${{ matrix.check }} on (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
@@ -97,6 +112,7 @@ jobs:
   done:
     name: Done
     needs:
+      - test-windows-rustls
       - test
       - wasm_test
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Release Notes
 
+## 0.5.0
+* Move to `memmap2` because `memmap` is unmaintained.
+* Enable `rustls` on `windows`
+
+([#206](https://github.com/infinyon/future-aio/pull/206))
+
+## 0.4.5
+* Doomsday timer to ensure crash ([#196](https://github.com/infinyon/future-aio/pull/196))
+
+## 0.4.4
+* update rustls
+
+## 0.4.3
+* expose futures
+
+## 0.4.2
+* re-export async_std::sync structs
+
 ## 0.4.1
 * Make tcp connector `Send` for `wasm32` ([#165](https://github.com/infinyon/future-aio/pull/165))
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fluvio-future"
-version = "0.4.5"
+version = "0.5.0"
 edition = "2021"
 authors = ["Fluvio Contributors <[email protected]>"]
 description = "I/O futures for Fluvio project"
@@ -46,7 +46,7 @@ openssl_tls = [
 timer = ["async-io", "pin-project", "futures-lite"]
 fs = ["async-fs", "futures-lite", "pin-utils", "async-trait"]
 zero_copy = ["nix", "task_unstable"]
-mmap = ["fs", "memmap", "task_unstable"]
+mmap = ["fs", "memmap2", "task_unstable"]
 retry = []
 doomsday = []
 
@@ -71,7 +71,7 @@ fluvio-async-tls = { version = "0.3.0", optional = true }
 async-std = { version = "1.6.2", default-features = false, optional = true }
 async-io = { version = "1.1.2", optional = true }
 async-net = { version = "1.6.0", optional = true }
-memmap = { version = "0.7.0", optional = true }
+memmap2 = { version = "0.5", optional = true }
 openssl = { version = "0.10.35", optional = true }
 async-native-tls = { version = "0.4.0", optional = true }
 native-tls = { version = "0.2.4", optional = true }

src/fs/mmap.rs

@@ -9,8 +9,8 @@ use std::sync::RwLockReadGuard;
 use std::sync::RwLockWriteGuard;
 
 use async_fs::File;
-use memmap::Mmap;
-use memmap::MmapMut;
+use memmap2::Mmap;
+use memmap2::MmapMut;
 
 use crate::task::spawn_blocking;
 

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, ConnectionFd, DomainConnector,
+        SplitConnection, TcpDomainConnector,
     };
 
     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