chore: rename middleware dirs

actix · Oct 29, 2023 · 0de1c02 · 0de1c02
1 parent 5d36d72
commit 0de1c02
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,11 +41,11 @@ members = [
    "json/json-validation",
    "json/json",
    "json/jsonrpc",
-   "middleware/middleware-encrypted-payloads",
-   "middleware/middleware-ext-mut",
-   "middleware/middleware-http-to-https",
-   "middleware/middleware",
+   "middleware/encrypted-payloads",
+   "middleware/http-to-https",
    "middleware/rate-limit",
+   "middleware/request-extensions",
+   "middleware/various",
    "protobuf",
    "run-in-thread",
    "server-sent-events",

diff --git a/.../middleware-encrypted-payloads/Cargo.toml → middleware/encrypted-payloads/Cargo.toml b/.../middleware-encrypted-payloads/Cargo.toml → middleware/encrypted-payloads/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "middleware-encrypted-payloads"
 version = "1.0.0"
-edition = "2021"
+publish.workspace = true
+edition.workspace = true
 
 [dependencies]
 actix-http.workspace = true

diff --git a/...e/middleware-encrypted-payloads/README.md → middleware/encrypted-payloads/README.md b/...e/middleware-encrypted-payloads/README.md → middleware/encrypted-payloads/README.md
diff --git a/...middleware-encrypted-payloads/src/main.rs → middleware/encrypted-payloads/src/main.rs b/...middleware-encrypted-payloads/src/main.rs → middleware/encrypted-payloads/src/main.rs
diff --git a/...eware/middleware-http-to-https/Cargo.toml → middleware/http-to-https/Cargo.toml b/...eware/middleware-http-to-https/Cargo.toml → middleware/http-to-https/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "middleware-http-to-https"
 version = "1.0.0"
-edition = "2021"
+publish.workspace = true
+edition.workspace = true
 
 [dependencies]
 actix-web = { workspace = true, features = ["rustls-0_21"] }

diff --git a/...leware/middleware-http-to-https/README.md → middleware/http-to-https/README.md b/...leware/middleware-http-to-https/README.md → middleware/http-to-https/README.md
@@ -15,6 +15,6 @@ Now, the only problem left to solve is, to listen to **HTTP** connections as wel
 ## Usage
 
 ```sh
-cd middleware/middleware-http-to-https
+cd middleware/http-to-https
 cargo run
 ```
diff --git a/middleware/middleware-http-to-https/cert.pem → middleware/http-to-https/cert.pem b/middleware/middleware-http-to-https/cert.pem → middleware/http-to-https/cert.pem
diff --git a/middleware/middleware-http-to-https/key.pem → middleware/http-to-https/key.pem b/middleware/middleware-http-to-https/key.pem → middleware/http-to-https/key.pem
diff --git a/...ware/middleware-http-to-https/src/main.rs → middleware/http-to-https/src/main.rs b/...ware/middleware-http-to-https/src/main.rs → middleware/http-to-https/src/main.rs
diff --git a/middleware/middleware-ext-mut/Cargo.toml → middleware/request-extensions/Cargo.toml b/middleware/middleware-ext-mut/Cargo.toml → middleware/request-extensions/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
-name = "middleware-ext-mut"
+name = "middleware-request-extensions"
 version = "1.0.0"
-edition = "2021"
+publish.workspace = true
+edition.workspace = true
 
 [dependencies]
 actix-web.workspace = true

diff --git a/middleware/middleware-ext-mut/README.md → middleware/request-extensions/README.md b/middleware/middleware-ext-mut/README.md → middleware/request-extensions/README.md
@@ -1,11 +1,11 @@
 # Middleware: Add/Retrieve Request-Local Data
 
-This example showcases a middleware that adds and retrieves request-local data. See also the [middleware guide](https://actix.rs/docs/middleware/).
+This example showcases a middleware that adds and retrieves request-local data. See also the [middleware guide](https://actix.rs/docs/middleware).
 
 ## Usage
 
 ```sh
-cd middleware/middleware-ext-mut
+cd middleware/request-extensions
 cargo run
 ```
 

diff --git a/middleware/middleware-ext-mut/src/add_msg.rs → middleware/request-extensions/src/add_msg.rs b/middleware/middleware-ext-mut/src/add_msg.rs → middleware/request-extensions/src/add_msg.rs
diff --git a/middleware/middleware-ext-mut/src/main.rs → middleware/request-extensions/src/main.rs b/middleware/middleware-ext-mut/src/main.rs → middleware/request-extensions/src/main.rs
diff --git a/middleware/middleware/Cargo.toml → middleware/various/Cargo.toml b/middleware/middleware/Cargo.toml → middleware/various/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
-name = "middleware-example"
+name = "middleware-various"
 version = "1.0.0"
-edition = "2021"
+publish.workspace = true
+edition.workspace = true
 
 [dependencies]
 actix-http.workspace = true

diff --git a/middleware/middleware/README.md → middleware/various/README.md b/middleware/middleware/README.md → middleware/various/README.md
@@ -1,13 +1,14 @@
 # Middleware: Various
 
-This example showcases a bunch of different uses of middleware. See also the [Middleware guide](https://actix.rs/docs/middleware/).
+This example showcases a bunch of different uses of middleware.
+
+See also the [Middleware guide](https://actix.rs/docs/middleware).
 
 ## Usage
 
 ```sh
-cd basics/middleware
+cd middleware/various
 cargo run
-# Started http server: 127.0.0.1:8080
 ```
 
 Look in `src/main.rs` and comment the different middleware in/out to see how they function.

diff --git a/middleware/middleware/src/main.rs → middleware/various/src/main.rs b/middleware/middleware/src/main.rs → middleware/various/src/main.rs
diff --git a/...eware/middleware/src/read_request_body.rs → middleware/various/src/read_request_body.rs b/...eware/middleware/src/read_request_body.rs → middleware/various/src/read_request_body.rs
diff --git a/...ware/middleware/src/read_response_body.rs → middleware/various/src/read_response_body.rs b/...ware/middleware/src/read_response_body.rs → middleware/various/src/read_response_body.rs
diff --git a/middleware/middleware/src/redirect.rs → middleware/various/src/redirect.rs b/middleware/middleware/src/redirect.rs → middleware/various/src/redirect.rs
diff --git a/middleware/middleware/src/simple.rs → middleware/various/src/simple.rs b/middleware/middleware/src/simple.rs → middleware/various/src/simple.rs