diff --git a/README.md b/README.md index 53b9b7f4..46d894e8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
[![Build Status](https://github.com/ntex-rs/ntex-extras/workflows/CI%20(Linux)/badge.svg)](https://travis-ci.org/ntex-rs/ntex) -[![Version](https://img.shields.io/badge/rustc-1.65+-lightgray.svg)](https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html) +[![Version](https://img.shields.io/badge/rustc-1.75+-lightgray.svg)](https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html) [![codecov](https://codecov.io/gh/ntex-rs/ntex-extras/branch/master/graph/badge.svg)](https://codecov.io/gh/ntex-rs/ntex-extras)
diff --git a/ntex-cors/Cargo.toml b/ntex-cors/Cargo.toml index a58efa79..2670ddbd 100644 --- a/ntex-cors/Cargo.toml +++ b/ntex-cors/Cargo.toml @@ -16,9 +16,9 @@ name = "ntex_cors" path = "src/lib.rs" [dependencies] -ntex = "1.0" +ntex = "1.1" derive_more = "0.99" futures = "0.3" [dev-dependencies] -ntex = { version = "1.0", features=["tokio"] } +ntex = { version = "1.1", features=["tokio"] } diff --git a/ntex-files/Cargo.toml b/ntex-files/Cargo.toml index 4c2809d8..ba048b99 100644 --- a/ntex-files/Cargo.toml +++ b/ntex-files/Cargo.toml @@ -18,7 +18,7 @@ name = "ntex_files" path = "src/lib.rs" [dependencies] -ntex = "1.0" +ntex = "1.1" ntex-http = "0.1.12" bitflags = "2.1" futures = "0.3" @@ -34,4 +34,4 @@ language-tags = "0.3" httpdate = "1.0" [dev-dependencies] -ntex = { version = "1.0", features = ["tokio", "openssl", "compress"] } +ntex = { version = "1.1", features = ["tokio", "openssl", "compress"] } diff --git a/ntex-identity/Cargo.toml b/ntex-identity/Cargo.toml index 66483959..197553b6 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 = "1.0" +ntex = "1.1" futures = "0.3" serde = "1.0" serde_json = "1.0" @@ -30,4 +30,4 @@ cookie = { version = "0.18", features = ["private"] } time = { version = "0.3", default-features = false, features = ["std"] } [dev-dependencies] -ntex = { version = "1.0", features=["tokio"] } +ntex = { version = "1.1", features=["tokio"] } diff --git a/ntex-multipart/Cargo.toml b/ntex-multipart/Cargo.toml index 66d486c8..ca3fba3c 100644 --- a/ntex-multipart/Cargo.toml +++ b/ntex-multipart/Cargo.toml @@ -16,7 +16,7 @@ name = "ntex_multipart" path = "src/lib.rs" [dependencies] -ntex = "1.0" +ntex = "1.1" derive_more = "0.99" httparse = "1.3" futures = "0.3" @@ -25,4 +25,4 @@ mime = "0.3" twoway = "0.2" [dev-dependencies] -ntex = { version = "1.0", features=["tokio"] } +ntex = { version = "1.1", features=["tokio"] } diff --git a/ntex-multipart/src/error.rs b/ntex-multipart/src/error.rs index d416accb..670f1117 100644 --- a/ntex-multipart/src/error.rs +++ b/ntex-multipart/src/error.rs @@ -1,6 +1,6 @@ //! Error and Result module use derive_more::{Display, From}; -use ntex::http::error::{ParseError, PayloadError}; +use ntex::http::error::{DecodeError, PayloadError}; use ntex::http::StatusCode; use ntex::web::error::{DefaultError, WebResponseError}; @@ -24,7 +24,7 @@ pub enum MultipartError { Incomplete, /// Error during field parsing #[display(fmt = "{}", _0)] - Parse(ParseError), + Decode(DecodeError), /// Payload error #[display(fmt = "{}", _0)] Payload(PayloadError), diff --git a/ntex-multipart/src/server.rs b/ntex-multipart/src/server.rs index 1dfe4fbb..c6990d86 100644 --- a/ntex-multipart/src/server.rs +++ b/ntex-multipart/src/server.rs @@ -4,7 +4,7 @@ use std::task::{Context, Poll}; use std::{cmp, convert::TryFrom, fmt, marker::PhantomData, pin::Pin, rc::Rc}; use futures::stream::{LocalBoxStream, Stream, StreamExt}; -use ntex::http::error::{ParseError, PayloadError}; +use ntex::http::error::{DecodeError, PayloadError}; use ntex::http::header::{self, HeaderMap, HeaderName, HeaderValue}; use ntex::task::LocalWaker; use ntex::util::{Bytes, BytesMut}; @@ -134,16 +134,16 @@ impl InnerMultipart { if let Ok(value) = HeaderValue::try_from(h.value) { headers.append(name, value); } else { - return Err(ParseError::Header.into()); + return Err(DecodeError::Header.into()); } } else { - return Err(ParseError::Header.into()); + return Err(DecodeError::Header.into()); } } Ok(Some(headers)) } - Ok(httparse::Status::Partial) => Err(ParseError::Header.into()), - Err(err) => Err(ParseError::from(err).into()), + Ok(httparse::Status::Partial) => Err(DecodeError::Header.into()), + Err(err) => Err(DecodeError::from(err).into()), } } } diff --git a/ntex-session/Cargo.toml b/ntex-session/Cargo.toml index 28b06d00..c270f562 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 = "1.0" +ntex = "1.1" cookie = "0.18" 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 = "1.0", features=["tokio"] } +ntex = { version = "1.1", features=["tokio"] }