Skip to content

Commit 3e84992

Browse files
emilbonnekadi-code
authored andcommitted
[Rust] Upgrade reqwest-middleware to 0.5 for reqwest 0.13 compatibility
The previous reqwest-middleware 0.4 depends on reqwest 0.12, which caused type conflicts when upgrading to reqwest 0.13: - reqwest::Error (from reqwest 0.13) - reqwest_middleware::reqwest::Error (from reqwest 0.12 via middleware) These are different types from different versions of reqwest. reqwest-middleware 0.5 is compatible with reqwest 0.13, resolving the version conflict. With both using the same reqwest version, the re-exported types are now correctly aligned.
1 parent ee4fd99 commit 3e84992

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

  • modules/openapi-generator/src/main/resources/rust
  • samples/client/petstore/rust/reqwest/petstore-async-middleware

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ secrecy = "0.8.0"
6868
{{^supportAsync}}
6969
reqwest = { version = "^0.13", default-features = false, features = ["json", "blocking", "multipart", "query", "form"] }
7070
{{#supportMiddleware}}
71-
reqwest-middleware = { version = "^0.4", features = ["json", "multipart"] }
71+
reqwest-middleware = { version = "^0.5", features = ["json", "multipart"] }
7272
{{/supportMiddleware}}
7373
{{/supportAsync}}
7474
{{#supportAsync}}
@@ -81,7 +81,7 @@ reqwest = { version = "^0.13", default-features = false, features = ["json", "mu
8181
reqwest = { version = "^0.13", default-features = false, features = ["json", "multipart", "query", "form"] }
8282
{{/useAsyncFileStream}}
8383
{{#supportMiddleware}}
84-
reqwest-middleware = { version = "^0.4", features = ["json", "multipart"] }
84+
reqwest-middleware = { version = "^0.5", features = ["json", "multipart"] }
8585
{{/supportMiddleware}}
8686
{{#supportTokenSource}}
8787
async-trait = "^0.1"
@@ -99,7 +99,7 @@ rustls = ["reqwest/rustls"]
9999
async-trait = "^0.1"
100100
reqwest = { version = "^0.13", default-features = false, features = ["json", "multipart", "stream", "query", "form"] }
101101
{{#supportMiddleware}}
102-
reqwest-middleware = { version = "^0.4", features = ["json", "multipart"] }
102+
reqwest-middleware = { version = "^0.5", features = ["json", "multipart"] }
103103
{{/supportMiddleware}}
104104
{{#supportTokenSource}}
105105
# TODO: propose to Yoshidan to externalize this as non google related crate, so that it can easily be extended for other cloud providers.

samples/client/petstore/rust/reqwest/petstore-async-middleware/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ uuid = { version = "^1.8", features = ["serde", "v4"] }
1616
tokio = { version = "^1.46.0", features = ["fs"] }
1717
tokio-util = { version = "^0.7", features = ["codec"] }
1818
reqwest = { version = "^0.13", default-features = false, features = ["json", "multipart", "stream", "query", "form"] }
19-
reqwest-middleware = { version = "^0.4", features = ["json", "multipart"] }
19+
reqwest-middleware = { version = "^0.5", features = ["json", "multipart"] }
2020

2121
[features]
2222
default = ["native-tls"]

0 commit comments

Comments
 (0)