Merge branch 'master' into dev/statx

Author: Berrysoft

azure-pipelines.yml

@@ -22,6 +22,11 @@ jobs:
           rustup +nightly target install $(target)
           cargo +nightly test --workspace --features=all,nightly --target $(target) -Z doctest-xcompile
         displayName: TestNightly
+      - script: |
+          rustup toolchain install beta
+          rustup +beta target install $(target)
+          cargo +beta test --workspace --features all --target $(target)
+        displayName: TestBeta
       # - script: |
       #     cargo test --workspace --features all --target $(target)
       #   displayName: TestStable
@@ -41,6 +46,10 @@ jobs:
           rustup toolchain install nightly
           cargo +nightly test --workspace --features all,nightly
         displayName: TestNightly
+      - script: |
+          rustup toolchain install beta
+          cargo +beta test --workspace --features all
+        displayName: TestBeta
       # - script: |
       #     cargo test --workspace --features all
       #   displayName: TestStable
@@ -49,6 +58,10 @@ jobs:
           rustup toolchain install nightly
           cargo +nightly test --workspace --features all,polling,native-tls,nightly --no-default-features
         displayName: TestNightly-polling
+      - script: |
+          rustup toolchain install beta
+          cargo +beta test --workspace --features all,polling --no-default-features
+        displayName: TestBeta-polling
       # - script: |
       #     cargo test --workspace --features all,polling --no-default-features
       #   displayName: TestStable-polling
@@ -68,6 +81,10 @@ jobs:
           rustup toolchain install nightly
           cargo +nightly test --workspace --features all,nightly
         displayName: TestNightly
+      - script: |
+          rustup toolchain install beta
+          cargo +beta test --workspace --features all
+        displayName: TestBeta
       # - script: |
       #     cargo test --workspace --features all
       #   displayName: TestStable

compio-net/src/resolve/mod.rs

@@ -5,9 +5,6 @@ cfg_if::cfg_if! {
     } else if #[cfg(all(target_os = "linux", target_env = "gnu"))] {
         #[path = "glibc.rs"]
         mod sys;
-    } else if #[cfg(unix)] {
-        #[path = "unix.rs"]
-        mod sys;
     }
 }
 
@@ -20,6 +17,7 @@ use std::{
 use compio_buf::{buf_try, BufResult};
 use either::Either;
 
+#[cfg(any(windows, all(target_os = "linux", target_env = "gnu")))]
 pub async fn resolve_sock_addrs(
     host: &str,
     port: u16,
@@ -48,7 +46,7 @@ pub async fn resolve_sock_addrs(
     unsafe { resolver.addrs() }
 }
 
-#[allow(dead_code)]
+#[cfg(any(windows, all(target_os = "linux", target_env = "gnu")))]
 fn to_addrs(mut result: *mut sys::addrinfo, port: u16) -> std::vec::IntoIter<SocketAddr> {
     use socket2::SockAddr;
 
@@ -77,6 +75,21 @@ fn to_addrs(mut result: *mut sys::addrinfo, port: u16) -> std::vec::IntoIter<Soc
     addrs.into_iter()
 }
 
+#[cfg(all(unix, not(all(target_os = "linux", target_env = "gnu"))))]
+pub async fn resolve_sock_addrs(
+    host: &str,
+    port: u16,
+) -> io::Result<std::vec::IntoIter<SocketAddr>> {
+    use std::net::ToSocketAddrs;
+
+    use compio_runtime::Runtime;
+
+    let host = host.to_string();
+    Runtime::current()
+        .spawn_blocking(move || (host, port).to_socket_addrs())
+        .await
+}
+
 /// A trait for objects which can be converted or resolved to one or more
 /// [`SocketAddr`] values.
 ///

compio-net/src/resolve/unix.rs

@@ -19,20 +19,19 @@ compio-buf = { workspace = true }
 compio-io = { workspace = true, features = ["compat"] }
 
 native-tls = { version = "0.2.11", optional = true }
-rustls = { version = "=0.22.0-alpha.6", optional = true }
-rustls-pki-types = { version = "0.2.3", optional = true }
+rustls = { version = "0.22.1", optional = true }
 
 [dev-dependencies]
 compio-net = { workspace = true }
 compio-runtime = { workspace = true }
 compio-macros = { workspace = true }
 
-rustls-native-certs = "=0.7.0-alpha.3"
+rustls-native-certs = "0.7.0"
 
 [features]
 default = ["native-tls"]
 all = ["native-tls", "rustls"]
-rustls = ["dep:rustls", "dep:rustls-pki-types"]
+rustls = ["dep:rustls"]
 
 read_buf = ["compio-buf/read_buf", "compio-io/read_buf", "rustls?/read_buf"]
 nightly = ["read_buf"]

compio-tls/Cargo.toml

@@ -2,9 +2,9 @@ use std::{io, ops::DerefMut, sync::Arc};
 
 use compio_io::{compat::SyncStream, AsyncRead, AsyncWrite};
 use rustls::{
-    ClientConfig, ClientConnection, ConnectionCommon, Error, ServerConfig, ServerConnection,
+    pki_types::ServerName, ClientConfig, ClientConnection, ConnectionCommon, Error, ServerConfig,
+    ServerConnection,
 };
-use rustls_pki_types::ServerName;
 
 use crate::TlsStream;
 

compio-tls/src/adapter/rtls.rs

@@ -35,7 +35,6 @@ async fn rtls() {
 
     let connector = TlsConnector::from(Arc::new(
         rustls::ClientConfig::builder()
-            .with_safe_defaults()
             .with_root_certificates(store)
             .with_no_client_auth(),
     ));