[xitca-web] update dep. (#9201)

TechEmpower · Aug 13, 2024 · 094e02d · 094e02d
1 parent 6130590
commit 094e02d
Show file tree

Hide file tree

Showing 8 changed files with 274 additions and 247 deletions.
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
@@ -11,7 +11,7 @@ required-features = ["io-uring", "pg", "router", "template"]
 [[bin]]
 name = "xitca-web-iou"
 path = "./src/main_iou.rs"
-required-features = ["io-uring", "perf", "pg-iou", "template"]
+required-features = ["io-uring", "perf", "pg", "template"]
 
 [[bin]]
 name = "xitca-web-wasm"
@@ -33,8 +33,6 @@ required-features = ["pg-orm", "template", "web-codegen"]
 pg = ["xitca-postgres/single-thread"]
 # pg send/sync optional
 pg-sync = ["xitca-postgres"]
-# pg io_uring optional
-pg-iou = ["pg", "xitca-postgres/io-uring"]
 # pg orm optional
 pg-orm = ["diesel"]
 # http router optional
@@ -53,18 +51,18 @@ axum = ["dep:axum", "http-body", "tower", "tower-http", "xitca-web/tower-http-co
 perf = ["mimalloc", "tokio/parking_lot"]
 
 [dependencies]
-xitca-http = "0.5"
-xitca-io = "0.3"
-xitca-server = "0.3"
-xitca-service = "0.1"
-xitca-unsafe-collection = "0.1.1"
+xitca-http = "0.6"
+xitca-io = "0.4"
+xitca-server = "0.4"
+xitca-service = "0.2"
+xitca-unsafe-collection = "0.2"
 
 atoi = "2"
 serde = { version = "1" }
 serde_json = { version = "1" }
 
 # web optional
-xitca-web = { version = "0.5", features = ["json"], optional = true }
+xitca-web = { version = "0.6", features = ["json"], optional = true }
 
 # raw-pg optional
 xitca-postgres = { version = "0.1", optional = true }
@@ -97,4 +95,4 @@ codegen-units = 1
 panic = "abort"
 
 [patch.crates-io]
-xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "ea1f5a2447e0969a6dff84eac9ff9ff90dbc7ed1" }
+xitca-postgres = { git = "https://github.com/HFQR/xitca-web.git", rev = "0cad5309beb278dc967378a35b733e26be0d4073" }
diff --git a/frameworks/Rust/xitca-web/src/main_iou.rs b/frameworks/Rust/xitca-web/src/main_iou.rs
@@ -24,7 +24,7 @@ use xitca_http::{
 };
 use xitca_io::{
     bytes::{Bytes, BytesMut},
-    io_uring::IoBuf,
+    io_uring::BoundedBuf,
     net::{io_uring::TcpStream as IOUTcpStream, TcpStream},
 };
 use xitca_service::{fn_build, fn_service, middleware::UncheckedReady, Service, ServiceExt};

diff --git a/frameworks/Rust/xitca-web/src/util.rs b/frameworks/Rust/xitca-web/src/util.rs
@@ -49,7 +49,7 @@ mod non_wasm {
         }
     }
 
-    #[cfg(any(feature = "pg", feature = "pg-iou"))]
+    #[cfg(feature = "pg")]
     mod pg_state {
         use core::{cell::RefCell, future::Future, pin::Pin};
 
@@ -79,7 +79,7 @@ mod non_wasm {
         }
     }
 
-    #[cfg(any(feature = "pg", feature = "pg-iou"))]
+    #[cfg(feature = "pg")]
     pub use pg_state::*;
 }
 

diff --git a/frameworks/Rust/xitca-web/xitca-web-axum.dockerfile b/frameworks/Rust/xitca-web/xitca-web-axum.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.77
+FROM rust:1.79
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web

diff --git a/frameworks/Rust/xitca-web/xitca-web-iou.dockerfile b/frameworks/Rust/xitca-web/xitca-web-iou.dockerfile
@@ -1,9 +1,9 @@
-FROM rust:1.77
+FROM rust:1.79
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web
 
-RUN cargo build --release --bin xitca-web-iou --features io-uring,perf,pg-iou,template
+RUN cargo build --release --bin xitca-web-iou --features io-uring,perf,pg,template
 
 EXPOSE 8080
 

diff --git a/frameworks/Rust/xitca-web/xitca-web-sync.dockerfile b/frameworks/Rust/xitca-web/xitca-web-sync.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.77
+FROM rust:1.79
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web

diff --git a/frameworks/Rust/xitca-web/xitca-web.dockerfile b/frameworks/Rust/xitca-web/xitca-web.dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.77
+FROM rust:1.79
 
 ADD ./ /xitca-web
 WORKDIR /xitca-web