Bump Rust edition to 2021 and a few crates #18608

maxnachlinger · 2024-05-08T13:07:28Z

Bump Rust edition to 2021 and a few crates. Fixes: #18609

PR checklist

Read the contribution guidelines.
Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
Run the following to build the project and update samples:
```
./mvnw clean package 
./bin/generate-samples.sh ./bin/configs/*.yaml
./bin/utils/export_docs_generators.sh
```
(For Windows users, please run the script in Git BASH)
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*.
IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
File the PR against the correct branch: master (upcoming 7.1.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request. @frol (2017/07) @farcaller (2017/08) @richardwhiuk (2019/07) @paladinzh (2020/05) @jacob-pro (2022/10)

maxnachlinger · 2024-05-08T13:11:54Z

modules/openapi-generator/src/main/resources/rust/Cargo.mustache

@@ -38,8 +38,8 @@ serde_derive = "^1.0"
 serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] }
 {{/serdeWith}}
 serde_json = "^1.0"
-url = "^2.2"
-uuid = { version = "^1.0", features = ["serde", "v4"] }
+url = "^2.5"


https://crates.io/crates/url

maxnachlinger · 2024-05-08T13:12:09Z

modules/openapi-generator/src/main/resources/rust/Cargo.mustache

-url = "^2.2"
-uuid = { version = "^1.0", features = ["serde", "v4"] }
+url = "^2.5"
+uuid = { version = "^1.8", features = ["serde", "v4"] }


https://crates.io/crates/uuid

maxnachlinger · 2024-05-08T13:12:51Z

modules/openapi-generator/src/main/resources/rust/Cargo.mustache

 features = ["json", "blocking", "multipart"]
 {{/supportAsync}}
 {{#supportAsync}}
 {{#supportMiddleware}}
-reqwest-middleware = "0.2.0"
+reqwest-middleware = "0.3.1"


https://crates.io/crates/reqwest-middleware

wing328 · 2024-05-08T13:27:59Z

thanks for the PR. can you please take a look at https://github.com/OpenAPITools/openapi-generator/actions/runs/9002489911/job/24730910208?pr=18608 when you've time?

maxnachlinger · 2024-05-08T13:40:09Z

@wing328 - I opened this PR too quickly, sorry for the churn. Fixing the build now :(

wing328 · 2024-05-08T13:51:07Z

Please take our time. Appreciate the PR to bump the dependencies to newer versions.

If you need help, let me know. (ping me via Slack)

maxnachlinger · 2024-05-08T14:37:12Z

modules/openapi-generator/src/main/resources/rust/Cargo.mustache

@@ -32,14 +32,13 @@ homepage = "{{.}}
 {{/homePageUrl}}

 [dependencies]
-serde = "^1.0"
-serde_derive = "^1.0"
+serde = { version = "^1.0", features = ["derive"] }


Using serde with the derive feature instead of serde_derive

Note: serde_derive hasn't been required in years at this point :) Even the serde docs show using the derive feature: https://serde.rs/derive.html#using-derive

maxnachlinger · 2024-05-08T14:39:10Z

modules/openapi-generator/src/main/resources/rust/Cargo.mustache

-features = ["json", "blocking", "multipart"]
+reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
+{{#supportMiddleware}}
+reqwest-middleware = { version = "^0.3", features = ["json", "blocking", "multipart"] }


reqwest-middleware requires the same features as reqwest

maxnachlinger · 2024-05-08T14:39:27Z

modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache

@@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error {

 impl From<http::Error> for Error {
    fn from(e: http::Error) -> Self {
-        return Error::Http(e)
+        Error::Http(e)


No need to return

maxnachlinger · 2024-05-08T15:06:50Z

@wing328 - PR is ready for a review

maxnachlinger · 2024-05-08T15:11:32Z

modules/openapi-generator/src/main/resources/rust/Cargo.mustache

-[dependencies.reqwest]
-version = "^0.11"
-features = ["json", "blocking", "multipart"]
+reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }


https://crates.io/crates/reqwest

maxnachlinger · 2024-05-08T15:11:50Z

modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache

@@ -174,7 +174,7 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration:
 	    {{/bodyParams}}
 	    {{/hasBodyParam}}
 	    {{^hasBodyParam}}
-	    &"",
+	    "",


Clippy to the rescue :)

wing328 · 2024-05-09T02:43:09Z

lgtm. thanks for the PR.

* bump Rust edition to 2021, update a few creates * bump Rust edition to 2021, update a few creates

maxnachlinger commented May 8, 2024

View reviewed changes

wing328 added Client: Rust Enhancement: Compatibility labels May 8, 2024

wing328 added this to the 7.6.0 milestone May 8, 2024

maxnachlinger marked this pull request as draft May 8, 2024 14:03

bump Rust edition to 2021, update a few creates

da88754

maxnachlinger force-pushed the chore-bump-edition-and-crates branch from d524d27 to da88754 Compare May 8, 2024 14:36

maxnachlinger commented May 8, 2024

View reviewed changes

bump Rust edition to 2021, update a few creates

6c97e44

maxnachlinger commented May 8, 2024

View reviewed changes

maxnachlinger marked this pull request as ready for review May 8, 2024 15:04

maxnachlinger commented May 8, 2024

View reviewed changes

wing328 merged commit 03389df into OpenAPITools:master May 9, 2024
18 checks passed

maxnachlinger deleted the chore-bump-edition-and-crates branch May 9, 2024 23:40

renatomameli pushed a commit to renatomameli/openapi-generator that referenced this pull request May 17, 2024

Bump Rust edition to 2021 and a few crates (OpenAPITools#18608)

efbbe2c

* bump Rust edition to 2021, update a few creates * bump Rust edition to 2021, update a few creates

jobs62 mentioned this pull request Jun 7, 2024

chore(rust): update reqwest to 0.12 ory/sdk#356

Closed

6 tasks

ross-paypay mentioned this pull request Oct 2, 2024

[REQ] [Rust] set default edition to 2021 #16925

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump Rust edition to 2021 and a few crates #18608

Bump Rust edition to 2021 and a few crates #18608

maxnachlinger commented May 8, 2024 •

edited

Loading

maxnachlinger May 8, 2024

maxnachlinger May 8, 2024

maxnachlinger May 8, 2024

wing328 commented May 8, 2024

maxnachlinger commented May 8, 2024

wing328 commented May 8, 2024

maxnachlinger May 8, 2024

maxnachlinger May 8, 2024

maxnachlinger May 8, 2024

maxnachlinger May 8, 2024

maxnachlinger commented May 8, 2024

maxnachlinger May 8, 2024

maxnachlinger May 8, 2024

wing328 commented May 9, 2024

Bump Rust edition to 2021 and a few crates #18608

Bump Rust edition to 2021 and a few crates #18608

Conversation

maxnachlinger commented May 8, 2024 • edited Loading

PR checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wing328 commented May 8, 2024

maxnachlinger commented May 8, 2024

wing328 commented May 8, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maxnachlinger commented May 8, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wing328 commented May 9, 2024

maxnachlinger commented May 8, 2024 •

edited

Loading