Use new optional deps syntax from Rust 1.60 (#285)

msrd0 · Nov 7, 2022 · 6a9151b · 6a9151b
1 parent 7cccdbd
commit 6a9151b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -33,7 +33,7 @@ jobs:
       matrix:
         rust:
           - name: MSRV
-            toolchain: 1.59
+            toolchain: "1.60"
             nightly: false
           - name: Stable
             toolchain: stable

diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ name = "gotham_restful"
 version = "0.7.8"
 authors = ["Dominic Meiser <[email protected]>"]
 edition = "2021"
-rust-version = "1.59.0"
+rust-version = "1.60.0"
 description = "RESTful additions for the gotham web framework"
 keywords = ["gotham", "rest", "restful", "web", "http"]
 categories = ["web-programming", "web-programming::http-server"]
@@ -53,14 +53,14 @@ trybuild = "=1.0.71"
 default = ["cors", "errorlog", "without-openapi"]
 full = ["auth", "cors", "database", "errorlog", "openapi"]
 
-auth = ["gotham_restful_derive/auth", "base64", "cookie", "jsonwebtoken"]
+auth = ["gotham_restful_derive/auth", "dep:base64", "dep:cookie", "dep:jsonwebtoken"]
 cors = []
-database = ["gotham_restful_derive/database", "gotham_middleware_diesel"]
+database = ["gotham_restful_derive/database", "dep:gotham_middleware_diesel"]
 errorlog = []
 
 # These features are exclusive - https://github.com/msrd0/gotham_restful/issues/4
 without-openapi = []
-openapi = ["gotham_restful_derive/openapi", "gotham_restful_redoc", "base64", "lazy-regex", "openapi_type", "parking_lot", "sha2"]
+openapi = ["gotham_restful_derive/openapi", "dep:gotham_restful_redoc", "dep:base64", "dep:lazy-regex", "dep:openapi_type", "dep:parking_lot", "dep:sha2"]
 
 [package.metadata.docs.rs]
 no-default-features = true

diff --git a/README.j2 b/README.j2
@@ -9,8 +9,8 @@
 	<a href="https://msrd0.github.io/gotham_restful/doc/gotham_restful/index.html">
 		<img alt="rustdoc" src="https://img.shields.io/badge/docs-main-blue.svg"/>
 	</a>
-	<a href="https://blog.rust-lang.org/2022/02/24/Rust-1.59.0.html">
-		<img alt="Rust 1.59+" src="https://img.shields.io/badge/rustc-1.59+-orange.svg"/>
+	<a href="https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html">
+		<img alt="Rust 1.60+" src="https://img.shields.io/badge/rustc-1.60+-orange.svg"/>
 	</a>
 	<a href="https://deps.rs/repo/github/msrd0/gotham_restful">
 		<img alt="dependencies" src="https://deps.rs/repo/github/msrd0/gotham_restful/status.svg"/>

diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@
 	<a href="https://msrd0.github.io/gotham_restful/doc/gotham_restful/index.html">
 		<img alt="rustdoc" src="https://img.shields.io/badge/docs-main-blue.svg"/>
 	</a>
-	<a href="https://blog.rust-lang.org/2022/02/24/Rust-1.59.0.html">
-		<img alt="Rust 1.59+" src="https://img.shields.io/badge/rustc-1.59+-orange.svg"/>
+	<a href="https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html">
+		<img alt="Rust 1.60+" src="https://img.shields.io/badge/rustc-1.60+-orange.svg"/>
 	</a>
 	<a href="https://deps.rs/repo/github/msrd0/gotham_restful">
 		<img alt="dependencies" src="https://deps.rs/repo/github/msrd0/gotham_restful/status.svg"/>
@@ -413,7 +413,7 @@ limitations under the License.
 ```
 
  [contributors]: https://github.com/msrd0/gotham_restful/graphs/contributors
- [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG_T9DC59itjXG40WOGuT-khOG4kS62Nc1tByG8bzxQdCjZw8YXKEG5SJ8EcO8pvsG6aAql37ujSmG2rGlxSAmKbZG4WCYbMMmkI6YWSEgmZnb3RoYW1lMC43LjGCbmdvdGhhbV9yZXN0ZnVsZTAuNy44gmxvcGVuYXBpX3R5cGVlMC40LjGCanNlcmRlX2pzb25mMS4wLjg3
+ [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG436MVLKTBbVG9rOTjYiQw70G6Fc8Kk_HdHWG4O0HsuDVOA0YXKEG5SJ8EcO8pvsG6aAql37ujSmG2rGlxSAmKbZG4WCYbMMmkI6YWSEgmZnb3RoYW1lMC43LjGCbmdvdGhhbV9yZXN0ZnVsZTAuNy44gmxvcGVuYXBpX3R5cGVlMC40LjGCanNlcmRlX2pzb25mMS4wLjg3
  [__link0]: https://crates.io/crates/gotham/0.7.1
  [__link1]: https://doc.rust-lang.org/stable/std/primitive.i64.html
  [__link10]: https://docs.rs/gotham/0.7.1/gotham/?search=state::State

diff --git a/crates-io.j2 b/crates-io.j2
@@ -1,4 +1,4 @@
-# gotham-restful [![Rust 1.59+](https://img.shields.io/badge/rustc-1.59+-orange.svg)](https://blog.rust-lang.org/2022/02/24/Rust-1.59.0.html) [![License Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![GitHub](https://img.shields.io/badge/Code-On%20Github-blue?logo=GitHub)](https://github.com/msrd0/gotham_restful)
+# gotham-restful [![Rust 1.60+](https://img.shields.io/badge/rustc-1.60+-orange.svg)](https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html) [![License Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![GitHub](https://img.shields.io/badge/Code-On%20Github-blue?logo=GitHub)](https://github.com/msrd0/gotham_restful)
 
 {{readme}}
 

diff --git a/crates-io.md b/crates-io.md
@@ -1,4 +1,4 @@
-# gotham-restful [![Rust 1.59+](https://img.shields.io/badge/rustc-1.59+-orange.svg)](https://blog.rust-lang.org/2022/02/24/Rust-1.59.0.html) [![License Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![GitHub](https://img.shields.io/badge/Code-On%20Github-blue?logo=GitHub)](https://github.com/msrd0/gotham_restful)
+# gotham-restful [![Rust 1.60+](https://img.shields.io/badge/rustc-1.60+-orange.svg)](https://blog.rust-lang.org/2022/04/07/Rust-1.60.0.html) [![License Apache-2.0](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![GitHub](https://img.shields.io/badge/Code-On%20Github-blue?logo=GitHub)](https://github.com/msrd0/gotham_restful)
 
 This crate is an extension to the popular [gotham web framework][__link0] for Rust. It allows you to create resources with assigned endpoints that aim to be a more convenient way of creating handlers for requests.
 
@@ -381,7 +381,7 @@ limitations under the License.
 ```
 
  [contributors]: https://github.com/msrd0/gotham_restful/graphs/contributors
- [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG6PbnIuA2DbfG4zPhMgEFY4jGyI4iOc_d8lZG3qmqxzKdxBSYXKEG5SJ8EcO8pvsG6aAql37ujSmG2rGlxSAmKbZG4WCYbMMmkI6YWSEgmZnb3RoYW1lMC43LjGCbmdvdGhhbV9yZXN0ZnVsZTAuNy44gmxvcGVuYXBpX3R5cGVlMC40LjGCanNlcmRlX2pzb25mMS4wLjg3
+ [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG3KdJKXEwaWOG99_CiC8-nxrGz_aER6k0qlfG3Z2QjvmmqerYXKEG5SJ8EcO8pvsG6aAql37ujSmG2rGlxSAmKbZG4WCYbMMmkI6YWSEgmZnb3RoYW1lMC43LjGCbmdvdGhhbV9yZXN0ZnVsZTAuNy44gmxvcGVuYXBpX3R5cGVlMC40LjGCanNlcmRlX2pzb25mMS4wLjg3
  [__link0]: https://crates.io/crates/gotham/0.7.1
  [__link1]: https://doc.rust-lang.org/stable/std/primitive.i64.html
  [__link10]: https://docs.rs/gotham/0.7.1/gotham/?search=state::State

diff --git a/redoc/Cargo.toml b/redoc/Cargo.toml
@@ -6,7 +6,6 @@ name = "gotham_restful_redoc"
 version = "0.2.1+2.0.0"
 authors = ["Dominic Meiser <[email protected]>"]
 edition = "2021"
-rust-version = "1.58.0"
 description = "Private implementation detail of gotham_restful"
 license = "Apache-2.0"
 repository = "https://github.com/msrd0/gotham_restful"