From 38cf72793c4006aa8d0416680fad56f01bb4c844 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Wed, 28 Dec 2022 13:43:07 +0100 Subject: [PATCH] update deps --- Cargo.toml | 10 ---------- ntex-cors/Cargo.toml | 4 ++-- ntex-cors/src/lib.rs | 4 ++-- ntex-files/Cargo.toml | 4 ++-- ntex-files/src/named.rs | 1 - ntex-identity/Cargo.toml | 4 ++-- ntex-identity/src/lib.rs | 4 ++-- ntex-multipart/Cargo.toml | 4 ++-- ntex-session/Cargo.toml | 4 ++-- ntex-session/src/cookie.rs | 4 ++-- 10 files changed, 16 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 13a28b28..5bf18879 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,13 +6,3 @@ members = [ "ntex-multipart", "ntex-session", ] - -[patch.crates-io] -ntex = { git = "https://github.com/ntex-rs/ntex.git", branch = "service-0-4" } -ntex-connect = { git = "https://github.com/ntex-rs/ntex.git", branch = "service-0-4" } -ntex-io = { git = "https://github.com/ntex-rs/ntex.git", branch = "service-0-4" } -ntex-service = { git = "https://github.com/ntex-rs/ntex.git", branch = "service-0-4" } -ntex-util = { git = "https://github.com/ntex-rs/ntex.git", branch = "service-0-4" } -ntex-tls = { git = "https://github.com/ntex-rs/ntex.git", branch = "service-0-4" } -ntex-tokio = { git = "https://github.com/ntex-rs/ntex.git", branch = "service-0-4" } -ntex-h2 = { git = "https://github.com/ntex-rs/ntex-h2.git", branch = "service-0-4" } diff --git a/ntex-cors/Cargo.toml b/ntex-cors/Cargo.toml index 505e82d9..96173faf 100644 --- a/ntex-cors/Cargo.toml +++ b/ntex-cors/Cargo.toml @@ -16,9 +16,9 @@ name = "ntex_cors" path = "src/lib.rs" [dependencies] -ntex = "0.6.0-alpha.0" +ntex = "0.6.0-beta.0" derive_more = "0.99" futures = "0.3" [dev-dependencies] -ntex = { version = "0.6.0-alpha.0", features=["tokio"] } +ntex = { version = "0.6.0-beta.0", features=["tokio"] } diff --git a/ntex-cors/src/lib.rs b/ntex-cors/src/lib.rs index 7614f39e..67f03517 100644 --- a/ntex-cors/src/lib.rs +++ b/ntex-cors/src/lib.rs @@ -760,8 +760,8 @@ where self.service.poll_ready(cx) } - fn poll_shutdown(&self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) + fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> { + self.service.poll_shutdown(cx) } fn call(&self, req: WebRequest) -> Self::Future<'_> { diff --git a/ntex-files/Cargo.toml b/ntex-files/Cargo.toml index 47db7765..a5f1c7df 100644 --- a/ntex-files/Cargo.toml +++ b/ntex-files/Cargo.toml @@ -18,7 +18,7 @@ name = "ntex_files" path = "src/lib.rs" [dependencies] -ntex = "0.6.0-alpha.0" +ntex = "0.6.0-beta.0" ntex-http = "0.1.8" bitflags = "1.3" futures = "0.3" @@ -32,4 +32,4 @@ percent-encoding = "2.1" v_htmlescape = "0.14.1" [dev-dependencies] -ntex = { version = "0.6.0-alpha.0", features=["tokio", "openssl", "compress"] } +ntex = { version = "0.6.0-beta.0", features=["tokio", "openssl", "compress"] } diff --git a/ntex-files/src/named.rs b/ntex-files/src/named.rs index 8ae4720b..baab7ae0 100644 --- a/ntex-files/src/named.rs +++ b/ntex-files/src/named.rs @@ -467,7 +467,6 @@ fn none_match(etag: Option<&header::EntityTag>, req: &HttpRequest) -> bool { } impl Responder for NamedFile { - type Error = Err::Container; type Future = Ready; fn respond_to(self, req: &HttpRequest) -> Self::Future { diff --git a/ntex-identity/Cargo.toml b/ntex-identity/Cargo.toml index 963bf9a4..5587a3a6 100644 --- a/ntex-identity/Cargo.toml +++ b/ntex-identity/Cargo.toml @@ -21,7 +21,7 @@ default = ["cookie-policy"] cookie-policy = ["cookie/secure", "ntex/cookie"] [dependencies] -ntex = "0.6.0-alpha.0" +ntex = "0.6.0-beta.0" futures = "0.3" serde = "1.0" serde_json = "1.0" @@ -30,4 +30,4 @@ cookie = { version = "0.16", features = ["private"] } time = { version = "0.3", default-features = false, features = ["std"] } [dev-dependencies] -ntex = { version = "0.6.0-alpha.0", features=["tokio"] } +ntex = { version = "0.6.0-beta.0", features=["tokio"] } diff --git a/ntex-identity/src/lib.rs b/ntex-identity/src/lib.rs index 37f35067..26dd0b0e 100644 --- a/ntex-identity/src/lib.rs +++ b/ntex-identity/src/lib.rs @@ -256,8 +256,8 @@ where self.service.poll_ready(cx) } - fn poll_shutdown(&self, cx: &mut Context, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) + fn poll_shutdown(&self, cx: &mut Context) -> Poll<()> { + self.service.poll_shutdown(cx) } fn call(&self, mut req: WebRequest) -> Self::Future<'_> { diff --git a/ntex-multipart/Cargo.toml b/ntex-multipart/Cargo.toml index e46eaaef..384d11eb 100644 --- a/ntex-multipart/Cargo.toml +++ b/ntex-multipart/Cargo.toml @@ -16,7 +16,7 @@ name = "ntex_multipart" path = "src/lib.rs" [dependencies] -ntex = "0.6.0-alpha.0" +ntex = "0.6.0-beta.0" derive_more = "0.99" httparse = "1.3" futures = "0.3" @@ -25,4 +25,4 @@ mime = "0.3" twoway = "0.2" [dev-dependencies] -ntex = { version = "0.6.0-alpha.0", features=["tokio"] } +ntex = { version = "0.6.0-beta.0", features=["tokio"] } diff --git a/ntex-session/Cargo.toml b/ntex-session/Cargo.toml index 1de869b6..88a42a7c 100644 --- a/ntex-session/Cargo.toml +++ b/ntex-session/Cargo.toml @@ -22,7 +22,7 @@ default = ["cookie-session"] cookie-session = ["cookie/secure", "ntex/cookie"] [dependencies] -ntex = "0.6.0-alpha.0" +ntex = "0.6.0-beta.0" cookie = "0.16" derive_more = "0.99" futures = "0.3" @@ -31,4 +31,4 @@ serde_json = "1.0" time = { version = "0.3", default-features = false, features = ["std"] } [dev-dependencies] -ntex = { version = "0.6.0-alpha.0", features=["tokio"] } +ntex = { version = "0.6.0-beta.0", features=["tokio"] } diff --git a/ntex-session/src/cookie.rs b/ntex-session/src/cookie.rs index f4ed20b6..b3c15cd0 100644 --- a/ntex-session/src/cookie.rs +++ b/ntex-session/src/cookie.rs @@ -307,8 +307,8 @@ where self.service.poll_ready(cx) } - fn poll_shutdown(&self, cx: &mut Context, is_error: bool) -> Poll<()> { - self.service.poll_shutdown(cx, is_error) + fn poll_shutdown(&self, cx: &mut Context) -> Poll<()> { + self.service.poll_shutdown(cx) } /// On first request, a new session cookie is returned in response, regardless