Skip to content

Commit a9a42e2

Browse files
fafhrd91fafhrd91
committed
Upgrade to ntex-service v4
1 parent 2430b69 commit a9a42e2

11 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎basics/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
55
edition = "2018"
66

77
[dependencies]
8-
ntex = { version = "3.0.0-pre.6", features = ["tokio"] }
8+
ntex = { version = "3.0.0-pre.9", features = ["tokio"] }
99
ntex-files = "3"
10-
ntex-session = "3"
10+
ntex-session = "3.1"
1111
futures = "0.3"
1212
env_logger = "0.11"

‎cookie-auth/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
55
edition = "2018"
66

77
[dependencies]
8-
ntex = { version = "3.0.0-pre.6", features = ["tokio"] }
9-
ntex-identity = "3.0.0"
8+
ntex = { version = "3.0.0-pre.9", features = ["tokio"] }
9+
ntex-identity = "3.1.0"
1010
env_logger = "0.11"

‎cookie-session/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
55
edition = "2018"
66

77
[dependencies]
8-
ntex = { version = "3.0.0-pre.6", features = ["tokio"] }
9-
ntex-session = "3.0.0"
8+
ntex = { version = "3.0.0-pre.9", features = ["tokio"] }
9+
ntex-session = "3.1.0"
1010
futures = "0.3"
1111
time = "0.3"
1212
env_logger = "0.11"

‎middleware/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Gorm Casper <gcasper@gmail.com>", "Sven-Hendrik Haase <svenstaro@gma
55
edition = "2018"
66

77
[dependencies]
8-
ntex = { version = "3.0.0-pre.6", features = ["tokio"] }
8+
ntex = { version = "3.0.0-pre.9", features = ["tokio"] }
99
env_logger = "0.11"
1010
futures = "0.3"
1111
pin-project = "1.0"

‎middleware/src/read_request_body.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use futures::stream::StreamExt;
2-
use ntex::service::{Middleware2, Service, ServiceCtx};
2+
use ntex::service::{Middleware, Service, ServiceCtx};
33
use ntex::util::BytesMut;
44
use ntex::web::{Error, ErrorRenderer, WebRequest, WebResponse};
55

66
pub struct Logging;
77

8-
impl<S, C> Middleware2<S, C> for Logging {
8+
impl<S, C> Middleware<S, C> for Logging {
99
type Service = LoggingMiddleware<S>;
1010

1111
fn create(&self, service: S, _: C) -> Self::Service {

‎middleware/src/read_response_body.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use std::{rc::Rc, task::Context, task::Poll};
22

33
use ntex::http::body::{Body, BodySize, MessageBody, ResponseBody};
4-
use ntex::service::{Middleware2, Service, ServiceCtx};
4+
use ntex::service::{Middleware, Service, ServiceCtx};
55
use ntex::util::{Bytes, BytesMut};
66
use ntex::web::{Error, WebRequest, WebResponse};
77

88
pub struct Logging;
99

10-
impl<S, C> Middleware2<S, C> for Logging {
10+
impl<S, C> Middleware<S, C> for Logging {
1111
type Service = LoggingMiddleware<S>;
1212

1313
fn create(&self, service: S, _: C) -> Self::Service {

‎middleware/src/redirect.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use ntex::http;
2-
use ntex::service::{Middleware2, Service, ServiceCtx};
2+
use ntex::service::{Middleware, Service, ServiceCtx};
33
use ntex::web::{Error, ErrorRenderer, HttpResponse, WebRequest, WebResponse};
44

55
pub struct CheckLogin;
66

7-
impl<S, C> Middleware2<S, C> for CheckLogin {
7+
impl<S, C> Middleware<S, C> for CheckLogin {
88
type Service = CheckLoginMiddleware<S>;
99

1010
fn create(&self, service: S, _: C) -> Self::Service {

‎middleware/src/simple.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ntex::service::{Middleware2, Service, ServiceCtx};
1+
use ntex::service::{Middleware, Service, ServiceCtx};
22
use ntex::web::{Error, WebRequest, WebResponse};
33

44
// There are two steps in middleware processing.
@@ -10,7 +10,7 @@ pub struct SayHi;
1010
// Middleware factory is `Middleware` trait from ntex-service crate
1111
// `S` - type of the next service
1212
// `B` - type of response's body
13-
impl<S, C> Middleware2<S, C> for SayHi {
13+
impl<S, C> Middleware<S, C> for SayHi {
1414
type Service = SayHiMiddleware<S>;
1515

1616
fn create(&self, service: S, _: C) -> Self::Service {

‎simple-auth-server/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ authors = ["mygnu <tech@hgill.io>"]
55
edition = "2018"
66

77
[dependencies]
8-
ntex-identity = "3"
9-
ntex = { version = "3.0.0-pre.6", features = ["tokio"] }
8+
ntex-identity = "3.1"
9+
ntex = { version = "3.0.0-pre.9", features = ["tokio"] }
1010
argonautica = "0.2"
1111
chrono = { version = "0.4.6", features = ["serde"] }
1212
derive_more = "0.99"

‎todo/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ version = "3.0.0"
55
edition = "2018"
66

77
[dependencies]
8-
ntex = { version = "3.0.0-pre.6", features = ["tokio"] }
8+
ntex = { version = "3.0.0-pre.9", features = ["tokio"] }
99
ntex-files = "3"
10-
ntex-session = "3"
10+
ntex-session = "3.1"
1111
dotenv = "0.15"
1212
env_logger = "0.11"
1313
futures = "0.3"

0 commit comments

Comments
 (0)