[Salvo] Upgrade to version 0.41.x (#8210)

* [Salvo] Upgrade to version 0.41.x

* Fix compile error

* Fix error

frameworks/Rust/salvo/Cargo.toml

@@ -43,13 +43,13 @@ diesel = { version = "2", features = ["postgres", "r2d2"] }
 deadpool = { version = "0.9", features = ["rt_tokio_1", "serde", "async-trait", "managed"] }
 deadpool-postgres = "0.10"
 futures-util = "0.3"
-moka = "0.10"
+moka = "0.11.0"
 markup = "0.13"
 # mimalloc = { version = "0.1", default-features = false }
 mongodb = { version = "2.4.0", features = ["zstd-compression", "snappy-compression", "zlib-compression"] }
 once_cell = "1"
 rand = { version = "0.8", features = ["min_const_gen", "small_rng"] }
-salvo = { version = "0.40", default-features = false, features = ["anyhow", "http1", "affix"] }
+salvo = { version = "0.41", default-features = false, features = ["anyhow", "http1", "affix"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 # smallvec = "1"

frameworks/Rust/salvo/src/main.rs

@@ -2,7 +2,6 @@
 // static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 use std::sync::Arc;
-use std::thread::available_parallelism;
 
 use bytes::Bytes;
 use salvo::conn::tcp::TcpAcceptor;
@@ -32,7 +31,7 @@ fn json(res: &mut Response) {
         message: "Hello, World!",
     })
     .unwrap();
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
 }
 
 #[handler]
@@ -40,33 +39,19 @@ fn plaintext(res: &mut Response) {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, PLAIN_HEADER.clone());
-    res.set_body(ResBody::Once(HELLO_WORD.clone()));
+    res.body(ResBody::Once(HELLO_WORD.clone()));
 }
-
+#[tokio::main]
+async 
 fn main() {
-    let size = available_parallelism().map(|n| n.get()).unwrap_or(16);
     let router = Arc::new(
         Router::new()
             .push(Router::with_path("plaintext").get(plaintext))
             .push(Router::with_path("json").get(json)),
     );
 
-    let rt = tokio::runtime::Builder::new_current_thread()
-        .enable_all()
-        .build()
-        .unwrap();
-    for _ in 1..size {
-        let router = router.clone();
-        std::thread::spawn(move || {
-            let rt = tokio::runtime::Builder::new_current_thread()
-                .enable_all()
-                .build()
-                .unwrap();
-            rt.block_on(serve(router));
-        });
-    }
     println!("Started http server: 127.0.0.1:8080");
-    rt.block_on(serve(router));
+    serve(router).await;
 }
 
 async fn serve(router: Arc<Router>) {

frameworks/Rust/salvo/src/main_diesel.rs

@@ -62,7 +62,7 @@ async fn world_row(res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -83,7 +83,7 @@ async fn queries(req: &mut Request, res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -115,7 +115,7 @@ async fn updates(req: &mut Request, res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -135,7 +135,7 @@ async fn fortunes(res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, HTML_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 

frameworks/Rust/salvo/src/main_moka.rs

@@ -47,7 +47,7 @@ fn cached_queries(req: &mut Request, res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 

frameworks/Rust/salvo/src/main_mongo.rs

@@ -45,7 +45,7 @@ async fn world_row(res: &mut Response, depot: &mut Depot) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -66,7 +66,7 @@ async fn queries(req: &mut Request, depot: &mut Depot, res: &mut Response) -> Re
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -92,7 +92,7 @@ async fn updates(req: &mut Request, depot: &mut Depot, res: &mut Response) -> Re
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -107,7 +107,7 @@ async fn fortunes(res: &mut Response, depot: &mut Depot) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, HTML_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 

frameworks/Rust/salvo/src/main_mongo_raw.rs

@@ -43,7 +43,7 @@ async fn world_row(res: &mut Response, depot: &mut Depot) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -64,7 +64,7 @@ async fn queries(req: &mut Request, depot: &mut Depot, res: &mut Response) -> Re
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -92,7 +92,7 @@ async fn updates(req: &mut Request, depot: &mut Depot, res: &mut Response) -> Re
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 

frameworks/Rust/salvo/src/main_pg.rs

@@ -46,7 +46,7 @@ impl Handler for WorldHandler {
         let headers = res.headers_mut();
         headers.insert(header::SERVER, SERVER_HEADER.clone());
         headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-        res.set_body(ResBody::Once(Bytes::from(data)));
+        res.body(ResBody::Once(Bytes::from(data)));
     }
 }
 struct WorldsHandler {
@@ -73,7 +73,7 @@ impl Handler for WorldsHandler {
         let headers = res.headers_mut();
         headers.insert(header::SERVER, SERVER_HEADER.clone());
         headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-        res.set_body(ResBody::Once(Bytes::from(data)));
+        res.body(ResBody::Once(Bytes::from(data)));
     }
 }
 struct UpdatesHandler {
@@ -101,7 +101,7 @@ impl Handler for UpdatesHandler {
         let headers = res.headers_mut();
         headers.insert(header::SERVER, SERVER_HEADER.clone());
         headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-        res.set_body(ResBody::Once(Bytes::from(data)));
+        res.body(ResBody::Once(Bytes::from(data)));
     }
 }
 struct FortunesHandler {
@@ -126,7 +126,7 @@ impl Handler for FortunesHandler {
         let headers = res.headers_mut();
         headers.insert(header::SERVER, SERVER_HEADER.clone());
         headers.insert(header::CONTENT_TYPE, HTML_HEADER.clone());
-        res.set_body(ResBody::Once(Bytes::from(data)));
+        res.body(ResBody::Once(Bytes::from(data)));
     }
 }
 

frameworks/Rust/salvo/src/main_pg_pool.rs

@@ -50,7 +50,7 @@ async fn world_row(res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -74,7 +74,7 @@ async fn queries(req: &mut Request, res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -109,7 +109,7 @@ async fn updates(req: &mut Request, res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -130,7 +130,7 @@ async fn fortunes(res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, HTML_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 

frameworks/Rust/salvo/src/main_sqlx.rs

@@ -47,7 +47,7 @@ async fn world_row(res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, JSON_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }
 
@@ -67,7 +67,7 @@ async fn fortunes(res: &mut Response) -> Result<(), Error> {
     let headers = res.headers_mut();
     headers.insert(header::SERVER, SERVER_HEADER.clone());
     headers.insert(header::CONTENT_TYPE, HTML_HEADER.clone());
-    res.set_body(ResBody::Once(Bytes::from(data)));
+    res.body(ResBody::Once(Bytes::from(data)));
     Ok(())
 }