[xitca-web] bug fix (#9243)

fakeshadow · web-flow · commit 902efb7223f1 · 2024-09-03T12:53:11.000-07:00
* [xitca-web] bug fix

* dep update.

* template fix
diff --git a/frameworks/Rust/xitca-web/Cargo.lock b/frameworks/Rust/xitca-web/Cargo.lock
diff --git a/frameworks/Rust/xitca-web/Cargo.toml b/frameworks/Rust/xitca-web/Cargo.toml
@@ -30,25 +30,25 @@ required-features = ["pg-orm", "template", "web-codegen"]
 
 [features]
 # pg optional
-pg = ["xitca-postgres/single-thread"]
+pg = ["dep:xitca-postgres"]
 # pg send/sync optional
-pg-sync = ["xitca-postgres"]
+pg-sync = ["dep:xitca-postgres"]
 # pg orm optional
-pg-orm = ["diesel"]
+pg-orm = ["dep:diesel"]
 # http router optional
 router = ["xitca-http/router"]
 # web optional
-web = ["xitca-web"]
+web = ["dep:xitca-web"]
 # web codegen optional
 web-codegen = ["xitca-web/codegen", "xitca-web/urlencoded"]
 # template optional
-template = ["sailfish"]
+template = ["dep:sailfish"]
 # io-uring optional
 io-uring = ["xitca-http/io-uring", "xitca-server/io-uring"]
 # axum optional
-axum = ["dep:axum", "http-body", "tower", "tower-http", "xitca-web/tower-http-compat" ]
+axum = ["dep:axum", "dep:http-body", "dep:tower", "dep:tower-http", "xitca-web/tower-http-compat" ]
 # unrealistic performance optimization
-perf = ["mimalloc", "tokio/parking_lot"]
+perf = ["dep:mimalloc", "tokio/parking_lot"]
 
 [dependencies]
 xitca-http = "0.6"
@@ -71,7 +71,7 @@ xitca-postgres = { version = "0.1", optional = true }
 diesel = { version = "2", features = ["postgres", "r2d2"], optional = true }
 
 # template optional
-sailfish = { version = "0.8", default-features = false, features = ["derive", "perf-inline"], optional = true }
+sailfish = { version = "0.9", default-features = false, features = ["derive", "perf-inline"], optional = true }
 
 # axum optional
 axum = { version = "0.7", optional = true, default-features = false, features = ["json", "query"] }
@@ -95,5 +95,5 @@ codegen-units = 1
 panic = "abort"
 
 [patch.crates-io]
-xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "f4e7bed" }
+xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "6870448" }
 mio = { git = "https://github.com/fakeshadow/mio", rev = "9bae6012b7ecfc6083350785f71a5e8265358178" }
diff --git a/frameworks/Rust/xitca-web/src/db.rs b/frameworks/Rust/xitca-web/src/db.rs
@@ -100,7 +100,7 @@ impl Client {
         let mut res = {
             let (ref mut rng, ref mut buf) = *self.shared();
 
-            let mut pipe = Pipeline::<_, false>::with_capacity_from_buf(len, buf);
+            let mut pipe = Pipeline::with_capacity_from_buf(len, buf);
 
             (0..num).try_for_each(|_| pipe.query_raw(&self.world, [rng.gen_id()]))?;
 
@@ -128,7 +128,7 @@ impl Client {
         let mut res = {
             let (ref mut rng, ref mut buf) = *self.shared();
 
-            let mut pipe = Pipeline::<_, false>::with_capacity_from_buf(len + 1, buf);
+            let mut pipe = Pipeline::with_capacity_from_buf(len + 1, buf);
 
             (0..num).try_for_each(|_| {
                 let w_id = rng.gen_id();
diff --git a/frameworks/Rust/xitca-web/templates/fortune.stpl b/frameworks/Rust/xitca-web/templates/fortune.stpl
@@ -4,7 +4,7 @@
   <body>
     <table>
       <tr><th>id</th><th>message</th></tr>
-      <% for item in items { %><tr><td><%= item.id %></td><td><%= &*item.message %></td></tr><% } %>
+      <% for item in self.items { %><tr><td><%= item.id %></td><td><%= &*item.message %></td></tr><% } %>
     </table>
   </body>
 </html>
