diff --git a/Cargo.toml b/Cargo.toml index e1ef89c8..19acf100 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,3 +13,4 @@ members = [ "examples/openapi_attributes", "examples/raw_identifiers", ] +resolver = "2" diff --git a/examples/custom_schema/Cargo.toml b/examples/custom_schema/Cargo.toml index d58a1884..ae902170 100644 --- a/examples/custom_schema/Cargo.toml +++ b/examples/custom_schema/Cargo.toml @@ -2,7 +2,7 @@ name = "custom_schema" version = "0.1.0" authors = ["Ralph Bisschops "] -edition = "2018" +edition = "2021" [dependencies] rocket = { version = "=0.5.0", default-features = false, features = ["json"] } diff --git a/examples/dyn_templates/Cargo.toml b/examples/dyn_templates/Cargo.toml index 0b0e1f24..964befb0 100644 --- a/examples/dyn_templates/Cargo.toml +++ b/examples/dyn_templates/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = [ "Ralph Bisschops ", ] -edition = "2018" +edition = "2021" [dependencies] rocket = { version = "=0.5.0", default-features = false, features = ["json"] } diff --git a/examples/json-web-api/Cargo.toml b/examples/json-web-api/Cargo.toml index 4aae3834..03e3aaa7 100644 --- a/examples/json-web-api/Cargo.toml +++ b/examples/json-web-api/Cargo.toml @@ -2,7 +2,7 @@ name = "json_web_api" version = "0.1.0" authors = ["Graham Esau "] -edition = "2018" +edition = "2021" [dependencies] rocket = { version = "=0.5.0", default-features = false, features = ["json"] } diff --git a/examples/raw_identifiers/Cargo.toml b/examples/raw_identifiers/Cargo.toml index 717e676d..08312fac 100644 --- a/examples/raw_identifiers/Cargo.toml +++ b/examples/raw_identifiers/Cargo.toml @@ -2,7 +2,7 @@ name = "raw_identifiers" version = "0.1.0" authors = ["Alex Payne "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/secure_request_guard/Cargo.toml b/examples/secure_request_guard/Cargo.toml index 7656d1be..655080d9 100644 --- a/examples/secure_request_guard/Cargo.toml +++ b/examples/secure_request_guard/Cargo.toml @@ -2,7 +2,7 @@ name = "secure_request_guard" version = "0.1.0" authors = ["Kristoffer Ödmark ", "Ralph Bisschops "] -edition = "2018" +edition = "2021" [dependencies] rocket = { version = "=0.5.0", default-features = false, features = ["json", "secrets"] } diff --git a/examples/special-types/Cargo.toml b/examples/special-types/Cargo.toml index 16e6c265..f85c8fea 100644 --- a/examples/special-types/Cargo.toml +++ b/examples/special-types/Cargo.toml @@ -2,7 +2,7 @@ name = "special-types" version = "0.1.0" authors = ["Ralph Bisschops "] -edition = "2018" +edition = "2021" [dependencies] rocket = { version = "=0.5.0", default-features = false, features = ["json"] } diff --git a/examples/streams/Cargo.toml b/examples/streams/Cargo.toml index db8aeb33..0a1ab827 100644 --- a/examples/streams/Cargo.toml +++ b/examples/streams/Cargo.toml @@ -2,7 +2,7 @@ name = "streams" version = "0.1.0" authors = ["Ralph Bisschops "] -edition = "2018" +edition = "2021" [dependencies] rocket = { version = "=0.5.0", default-features = false, features = ["json"] } diff --git a/examples/uuid/Cargo.toml b/examples/uuid/Cargo.toml index d3a4d6ef..420abfc0 100644 --- a/examples/uuid/Cargo.toml +++ b/examples/uuid/Cargo.toml @@ -6,7 +6,7 @@ authors = [ "Rafael Epplee ", "Ralph Bisschops ", ] -edition = "2018" +edition = "2021" [dependencies] rocket = { version = "=0.5.0", default-features = false, features = ["json", "uuid"] } diff --git a/okapi/CHANGELOG.md b/okapi/CHANGELOG.md index 2fea3ebf..3d3c639d 100644 --- a/okapi/CHANGELOG.md +++ b/okapi/CHANGELOG.md @@ -23,6 +23,7 @@ This project follows the [Semantic Versioning standard](https://semver.org/). ### Changed - `merge_paths` does correctly handle the merging of paths with double `/` in the combined path. +- Updated to Rust 2021 edition. ### Deprecated diff --git a/okapi/Cargo.toml b/okapi/Cargo.toml index 3b49c42b..afaa211e 100644 --- a/okapi/Cargo.toml +++ b/okapi/Cargo.toml @@ -4,7 +4,7 @@ description = "Structs for OpenAPI (AKA Swagger) documents" repository = "https://github.com/GREsau/okapi" version = "0.7.0" authors = ["Graham Esau "] -edition = "2018" +edition = "2021" license = "MIT" readme = "../README.md" keywords = ["rust", "openapi", "swagger"] diff --git a/rocket-okapi-codegen/Cargo.toml b/rocket-okapi-codegen/Cargo.toml index 5093d2d7..dc75c736 100644 --- a/rocket-okapi-codegen/Cargo.toml +++ b/rocket-okapi-codegen/Cargo.toml @@ -4,7 +4,7 @@ description = "Macros supporting rocket_okapi" repository = "https://github.com/GREsau/okapi" version = "0.8.0" authors = ["Graham Esau "] -edition = "2018" +edition = "2021" license = "MIT" readme = "../README.md" keywords = ["rust", "openapi", "swagger", "rocket"] diff --git a/rocket-okapi/CHANGELOG.md b/rocket-okapi/CHANGELOG.md index ccc74c91..0fdb5c9e 100644 --- a/rocket-okapi/CHANGELOG.md +++ b/rocket-okapi/CHANGELOG.md @@ -40,6 +40,7 @@ This project follows the [Semantic Versioning standard](https://semver.org/). - `SlotsConfig` added: `operations_top`. - Note: The default `RenderStyle` changed from `View` to `Read`. - Note: `schema_hide_read_only` and `schema_hide_write_only` changed behavior. +- Updated all crates to Rust 2021 edition. ### Deprecated diff --git a/rocket-okapi/Cargo.toml b/rocket-okapi/Cargo.toml index 50c4b0f1..c897d869 100644 --- a/rocket-okapi/Cargo.toml +++ b/rocket-okapi/Cargo.toml @@ -4,7 +4,7 @@ description = "OpenAPI (AKA Swagger) document generation for Rocket applications repository = "https://github.com/GREsau/okapi" version = "0.8.0" authors = ["Graham Esau "] -edition = "2018" +edition = "2021" license = "MIT" readme = "../README.md" keywords = ["rust", "openapi", "swagger", "rocket"]