bytedance · zh-jq-b · Oct 16, 2023 · Oct 16, 2023 · Oct 16, 2023 · Nov 20, 2023
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,9 +12,9 @@ jobs:
     strategy:
       matrix:
         rust:
-        - stable
-        - beta
-        - nightly
+          #- stable
+          #- beta
+          - nightly
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
     - name: Checkout sources
       uses: actions/checkout@v4
     - name: Install rust toolchain
-      uses: dtolnay/rust-toolchain@stable
+      uses: dtolnay/rust-toolchain@nightly
       with:
         components: clippy
     - name: Install dependencies

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -12,8 +12,8 @@ jobs:
     strategy:
       matrix:
         rust:
-          - stable
-          - beta
+          #- stable
+          #- beta
           - nightly
     steps:
       - name: Checkout sources
@@ -37,7 +37,7 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
       - name: Install rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@nightly
         with:
           components: clippy
       - name: Install dependencies

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -193,10 +193,10 @@ g3-ctl = { version = "0.1", path = "lib/g3-ctl" }
 g3-datetime = { version = "0.1", path = "lib/g3-datetime" }
 g3-dpi = { version = "0.1", path = "lib/g3-dpi" }
 g3-fluentd = { version = "0.1", path = "lib/g3-fluentd" }
-g3-ftp-client = { version = "0.2", path = "lib/g3-ftp-client" }
+g3-ftp-client = { version = "0.3", path = "lib/g3-ftp-client" }
 g3-h2 = { version = "0.1", path = "lib/g3-h2" }
 g3-http = { version = "0.2", path = "lib/g3-http" }
-g3-icap-client = { version = "0.1", path = "lib/g3-icap-client" }
+g3-icap-client = { version = "0.2", path = "lib/g3-icap-client" }
 g3-io-ext = { version = "0.6", path = "lib/g3-io-ext" }
 g3-journal = { version = "0.2", path = "lib/g3-journal" }
 g3-json = { version = "0.3", path = "lib/g3-json" }

diff --git a/g3bench/Cargo.toml b/g3bench/Cargo.toml
@@ -13,7 +13,6 @@ thiserror.workspace = true
 anyhow.workspace = true
 clap.workspace = true
 clap_complete.workspace = true
-async-trait.workspace = true
 indicatif = "0.17"
 tokio = { workspace = true, features = ["rt", "net", "macros"] }
 http.workspace = true

diff --git a/g3bench/src/target/dns/task.rs b/g3bench/src/target/dns/task.rs
@@ -18,7 +18,6 @@ use std::cell::UnsafeCell;
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context};
-use async_trait::async_trait;
 use hickory_client::client::{AsyncClient, ClientHandle};
 use hickory_proto::op::ResponseCode;
 use tokio::time::Instant;
@@ -133,7 +132,6 @@ impl DnsTaskContext {
     }
 }
 
-#[async_trait]
 impl BenchTaskContext for DnsTaskContext {
     fn mark_task_start(&self) {
         self.runtime_stats.add_task_total();

diff --git a/g3bench/src/target/h1/task.rs b/g3bench/src/target/h1/task.rs
@@ -18,7 +18,6 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::{anyhow, Context};
-use async_trait::async_trait;
 use futures_util::FutureExt;
 use tokio::io::{AsyncReadExt, AsyncWriteExt, BufReader};
 use tokio::time::Instant;
@@ -183,7 +182,6 @@ impl HttpTaskContext {
     }
 }
 
-#[async_trait]
 impl BenchTaskContext for HttpTaskContext {
     fn mark_task_start(&self) {
         self.runtime_stats.add_task_total();

diff --git a/g3bench/src/target/h2/task.rs b/g3bench/src/target/h2/task.rs
@@ -17,7 +17,6 @@
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context};
-use async_trait::async_trait;
 use bytes::Bytes;
 use h2::client::SendRequest;
 use tokio::time::Instant;
@@ -180,7 +179,6 @@ impl H2TaskContext {
     }
 }
 
-#[async_trait]
 impl BenchTaskContext for H2TaskContext {
     fn mark_task_start(&self) {
         self.runtime_stats.add_task_total();

diff --git a/g3bench/src/target/h3/task.rs b/g3bench/src/target/h3/task.rs
@@ -17,7 +17,6 @@
 use std::sync::Arc;
 
 use anyhow::{anyhow, Context};
-use async_trait::async_trait;
 use bytes::Bytes;
 use h3::client::SendRequest;
 use h3_quinn::OpenStreams;
@@ -167,7 +166,6 @@ impl H3TaskContext {
     }
 }
 
-#[async_trait]
 impl BenchTaskContext for H3TaskContext {
     fn mark_task_start(&self) {
         self.runtime_stats.add_task_total();

diff --git a/g3bench/src/target/keyless/cloudflare/task.rs b/g3bench/src/target/keyless/cloudflare/task.rs
@@ -17,7 +17,6 @@
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use async_trait::async_trait;
 use tokio::time::Instant;
 
 use super::{
@@ -179,7 +178,6 @@ impl KeylessCloudflareTaskContext {
     }
 }
 
-#[async_trait]
 impl BenchTaskContext for KeylessCloudflareTaskContext {
     fn mark_task_start(&self) {
         self.runtime_stats.add_task_total();

diff --git a/g3bench/src/target/keyless/openssl/task.rs b/g3bench/src/target/keyless/openssl/task.rs
@@ -16,7 +16,6 @@
 
 use std::sync::Arc;
 
-use async_trait::async_trait;
 use tokio::time::Instant;
 
 use super::{
@@ -57,7 +56,6 @@ impl KeylessOpensslTaskContext {
     }
 }
 
-#[async_trait]
 impl BenchTaskContext for KeylessOpensslTaskContext {
     fn mark_task_start(&self) {
         self.runtime_stats.add_task_total();

diff --git a/g3bench/src/target/mod.rs b/g3bench/src/target/mod.rs
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
+use std::future::Future;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::{anyhow, Context};
-use async_trait::async_trait;
 use cadence::{Gauged, StatsdClient};
 use hdrhistogram::Histogram;
 use tokio::signal::unix::SignalKind;
@@ -173,12 +173,17 @@ enum BenchError {
     Task(anyhow::Error),
 }
 
-#[async_trait]
 trait BenchTaskContext {
     fn mark_task_start(&self);
     fn mark_task_passed(&self);
     fn mark_task_failed(&self);
-    async fn run(&mut self, task_id: usize, time_started: Instant) -> Result<(), BenchError>;
+
+    // TODO use native async fn declaration
+    fn run(
+        &mut self,
+        task_id: usize,
+        time_started: Instant,
+    ) -> impl Future<Output = Result<(), BenchError>> + Send;
 }
 
 trait BenchTarget<RS, H, C>

diff --git a/g3bench/src/target/ssl/task.rs b/g3bench/src/target/ssl/task.rs
@@ -18,7 +18,6 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::anyhow;
-use async_trait::async_trait;
 use tokio::io::AsyncWriteExt;
 use tokio::net::TcpStream;
 use tokio::time::Instant;
@@ -76,7 +75,6 @@ impl SslTaskContext {
     }
 }
 
-#[async_trait]
 impl BenchTaskContext for SslTaskContext {
     fn mark_task_start(&self) {
         self.runtime_stats.add_task_total();

diff --git a/g3keymess/Cargo.toml b/g3keymess/Cargo.toml
@@ -26,7 +26,6 @@ chrono = { workspace = true, features = ["clock"] }
 uuid.workspace = true
 url.workspace = true
 ahash.workspace = true
-async-trait.workspace = true
 futures-util.workspace = true
 cadence.workspace = true
 itoa.workspace = true

diff --git a/g3keymess/src/config/store/local.rs b/g3keymess/src/config/store/local.rs
@@ -17,7 +17,6 @@
 use std::path::{Path, PathBuf};
 
 use anyhow::anyhow;
-use async_trait::async_trait;
 use openssl::pkey::{PKey, Private};
 use tokio::sync::oneshot;
 use yaml_rust::{yaml, Yaml};
@@ -88,7 +87,6 @@ impl LocalKeyStoreConfig {
     }
 }
 
-#[async_trait]
 impl KeyStoreConfig for LocalKeyStoreConfig {
     #[inline]
     fn name(&self) -> &MetricsName {

diff --git a/g3keymess/src/config/store/mod.rs b/g3keymess/src/config/store/mod.rs
@@ -17,7 +17,6 @@
 use std::path::Path;
 
 use anyhow::anyhow;
-use async_trait::async_trait;
 use openssl::pkey::{PKey, Private};
 use tokio::sync::oneshot;
 use yaml_rust::{yaml, Yaml};
@@ -33,7 +32,6 @@ pub(crate) use registry::{clear, get_all};
 
 const CONFIG_KEY_STORE_TYPE: &str = "type";
 
-#[async_trait]
 pub trait KeyStoreConfig {
     fn name(&self) -> &MetricsName;
     async fn load_certs(&self) -> anyhow::Result<Vec<PKey<Private>>>;

diff --git a/g3keymess/src/config/store/redis.rs b/g3keymess/src/config/store/redis.rs
@@ -15,7 +15,6 @@
  */
 
 use anyhow::anyhow;
-use async_trait::async_trait;
 use openssl::pkey::{PKey, Private};
 use url::Url;
 use yaml_rust::{yaml, Yaml};
@@ -80,7 +79,6 @@ impl RedisKeyStoreConfig {
     }
 }
 
-#[async_trait]
 impl KeyStoreConfig for RedisKeyStoreConfig {
     #[inline]
     fn name(&self) -> &MetricsName {

diff --git a/g3proxy/src/inspect/http/v1/forward/adaptation.rs b/g3proxy/src/inspect/http/v1/forward/adaptation.rs
@@ -18,7 +18,6 @@ use std::io::{self, IoSlice};
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
-use async_trait::async_trait;
 use tokio::io::{AsyncWrite, AsyncWriteExt};
 
 use g3_http::server::HttpTransparentRequest;
@@ -61,7 +60,6 @@ where
     }
 }
 
-#[async_trait]
 impl<'a, W> HttpRequestUpstreamWriter<HttpTransparentRequest>
     for HttpRequestWriterForAdaptation<'a, W>
 where

diff --git a/g3proxy/src/lib.rs b/g3proxy/src/lib.rs
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#![feature(trait_upcasting)]
+
 pub mod audit;
 pub mod auth;
 pub mod config;

diff --git a/g3proxy/src/module/http_forward/connection/mod.rs b/g3proxy/src/module/http_forward/connection/mod.rs
@@ -108,7 +108,6 @@ impl<'a> AsyncWrite for HttpForwardWriterForAdaptation<'a> {
     }
 }
 
-#[async_trait]
 impl<'a> HttpRequestUpstreamWriter<HttpProxyClientRequest> for HttpForwardWriterForAdaptation<'a> {
     async fn send_request_header(&mut self, req: &HttpProxyClientRequest) -> io::Result<()> {
         self.inner.send_request_header(req).await