chore: upgrade to ntex 2.0 (#9)

* chore: upgrade to ntex 2.0 * chore: upgrade ntex-extras deps
ntex-rs · May 28, 2024 · 617bde7 · 617bde7
1 parent db621a8
commit 617bde7
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 26 deletions.
diff --git a/examples/application/Cargo.toml b/examples/application/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 workspace = "../"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
diff --git a/examples/async-handlers/Cargo.toml b/examples/async-handlers/Cargo.toml
@@ -4,6 +4,6 @@ version = "2.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 futures = "0.3.1"
 bytes = "0.5"
diff --git a/examples/databases/Cargo.toml b/examples/databases/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 diesel = { version = "2", features = ["sqlite", "r2d2"] }
 serde = { version = "1", features = ["derive"] }
 uuid = { version = "1", features = ["v4"] }
diff --git a/examples/either/Cargo.toml b/examples/either/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
diff --git a/examples/errors/Cargo.toml b/examples/errors/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 derive_more = "0.99"
 env_logger = "0.7"
 log = "0.4"
diff --git a/examples/extractors/Cargo.toml b/examples/extractors/Cargo.toml
@@ -4,6 +4,6 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 serde = "1.0"
 serde_json = "1.0"
diff --git a/examples/flexible-responders/Cargo.toml b/examples/flexible-responders/Cargo.toml
@@ -4,5 +4,5 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 serde = "1.0"
diff --git a/examples/getting-started/Cargo.toml b/examples/getting-started/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 workspace = "../"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
diff --git a/examples/http2/Cargo.toml b/examples/http2/Cargo.toml
@@ -4,5 +4,5 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio", "openssl"] }
+ntex = { version = "2", features = ["tokio", "openssl"] }
 openssl = { version = "0.10", features = ["v110", "vendored"] }
diff --git a/examples/main-example/Cargo.toml b/examples/main-example/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
diff --git a/examples/middleware/Cargo.toml b/examples/middleware/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio", "cookie"] }
-ntex-session = { version = "1" }
+ntex = { version = "2", features = ["tokio", "cookie"] }
+ntex-session = { version = "2" }
 futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
 env_logger = "0.10.0"
diff --git a/examples/middleware/src/errorhandler.rs b/examples/middleware/src/errorhandler.rs
@@ -27,7 +27,7 @@ where
     type Response = web::WebResponse;
     type Error = web::Error;
 
-    ntex::forward_poll_ready!(service);
+    ntex::forward_ready!(service);
 
     async fn call(&self, req: web::WebRequest<Err>, ctx: ServiceCtx<'_, Self>) -> Result<Self::Response, Self::Error> {
             ctx.call(&self.service, req).await.map(|mut res| {

diff --git a/examples/middleware/src/main.rs b/examples/middleware/src/main.rs
@@ -33,7 +33,7 @@ where
     type Response = web::WebResponse;
     type Error = web::Error;
 
-    ntex::forward_poll_ready!(service);
+    ntex::forward_ready!(service);
 
     async fn call(&self, req: web::WebRequest<Err>, ctx: ServiceCtx<'_, Self>) -> Result<Self::Response, Self::Error> {
         println!("Hi from start. You requested: {}", req.path());

diff --git a/examples/powerful-extractors/Cargo.toml b/examples/powerful-extractors/Cargo.toml
@@ -4,5 +4,5 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 serde = "1.0"
diff --git a/examples/request-handlers/Cargo.toml b/examples/request-handlers/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
diff --git a/examples/request-routing/Cargo.toml b/examples/request-routing/Cargo.toml
@@ -4,4 +4,4 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
diff --git a/examples/requests/Cargo.toml b/examples/requests/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2018"
 [dependencies]
 serde = "1.0"
 serde_json = "1.0"
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 futures = "0.3.1"
 ntex-multipart = "1"
diff --git a/examples/responses/Cargo.toml b/examples/responses/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio", "compress"] }
+ntex = { version = "2", features = ["tokio", "compress"] }
 serde = "1.0"
 futures = "0.3.1"
 bytes = "0.5"
diff --git a/examples/server/Cargo.toml b/examples/server/Cargo.toml
@@ -5,7 +5,7 @@ workspace = "../"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio", "openssl"] }
+ntex = { version = "2", features = ["tokio", "openssl"] }
 futures = "0.3"
 openssl = { version = "0.10", features = ["vendored"] }
 tokio = { version = "1.16.1", features = ["full"] }
diff --git a/examples/static-files/Cargo.toml b/examples/static-files/Cargo.toml
@@ -4,6 +4,6 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
-ntex-files = "1"
+ntex = { version = "2", features = ["tokio"] }
+ntex-files = "2"
 mime = "0.3"
diff --git a/examples/testing/Cargo.toml b/examples/testing/Cargo.toml
@@ -4,7 +4,7 @@ version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 futures = "0.3"
 futures-util = "0.3"
 bytes = "0.5"

diff --git a/examples/url-dispatch/Cargo.toml b/examples/url-dispatch/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 workspace = "../"
 
 [dependencies]
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
 futures = "0.3.1"
 openssl = "0.10"
 serde = "1.0"
diff --git a/examples/websockets/Cargo.toml b/examples/websockets/Cargo.toml
@@ -5,4 +5,4 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.27"
-ntex = { version = "1", features = ["tokio"] }
+ntex = { version = "2", features = ["tokio"] }
diff --git a/vars.js b/vars.js
@@ -1,4 +1,4 @@
 module.exports = {
   rustVersion: '1.75',
-  ntexMajorVersion: '1.0',
+  ntexMajorVersion: '2.0',
 };