Merge pull request #25 from zhangzqs/master

Bump version to v0.2.3
qiniu · May 23, 2023 · 5f7c4a3 · 5f7c4a3
2 parents 66a7b13 + 4f353e7
commit 5f7c4a3
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 61 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change log
 
+## v0.2.3
+
+- 修复 `c-ares` 高版本在 `windows` 平台无法正常使用的问题
+- 修复 `fs4` 在 `windows` 平台编译失败的问题
+- 修复 `qiniu_upload_token` 中的一些 `clippy check` 的问题
+- 修改 `qiniu_objects_manager::ListVersion` 中的默认版本为 `V1`
+
 ## v0.2.2
 
 - 修复 `qiniu_objects_manager::ListStream` 在使用 V2 API 列举时，当无法列举到结果时会导致无限循环的问题。

diff --git a/api-generator/Cargo.toml b/api-generator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-api-generator"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -29,8 +29,8 @@ walkdir = "2.3.2"
 
 [dev-dependencies]
 serde_json = "1.0.68"
-qiniu-http = { version = "0.2.2", path = "../http" }
-qiniu-http-client = { version = "0.2.2", path = "../http-client" }
-qiniu-upload-token = { version = "0.2.2", path = "../upload-token" }
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-http = { version = "0.2.3", path = "../http" }
+qiniu-http-client = { version = "0.2.3", path = "../http-client" }
+qiniu-upload-token = { version = "0.2.3", path = "../upload-token" }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 indexmap = "1.7.0"
diff --git a/apis/Cargo.toml b/apis/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-apis"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -22,8 +22,8 @@ indexmap = "1.7.0"
 futures = { version = "0.3.5", optional = true }
 async-std = { version = "1.9.0", optional = true }
 
-qiniu-http-client = { version = "0.2.2", path = "../http-client", default-features = false }
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-http-client = { version = "0.2.3", path = "../http-client", default-features = false }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [features]
 default = ["ureq"]

diff --git a/credential/Cargo.toml b/credential/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-credential"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -24,7 +24,7 @@ assert-impl = "0.1.3"
 auto_impl = "1.0.0"
 futures-lite = { version = "1.12.0", optional = true }
 
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [dev-dependencies]
 anyhow = "1.0.41"

diff --git a/download-manager/Cargo.toml b/download-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-download-manager"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -26,7 +26,7 @@ futures = { version = "0.3.5", optional = true }
 async-std = { version = "1.9.0", optional = true }
 smart-default = { version = "0.6.0", optional = true }
 
-qiniu-apis = { version = "0.2.2", path = "../apis", default-features = false }
+qiniu-apis = { version = "0.2.3", path = "../apis", default-features = false }
 
 [dev-dependencies]
 rand = "0.8.3"

diff --git a/etag/Cargo.toml b/etag/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-etag"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -19,7 +19,7 @@ digest = "0.9.0"
 assert-impl = "0.1.3"
 futures-lite = { version = "1.12.0", optional = true }
 
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [dev-dependencies]
 async-std = { version = "1.9.0", features = ["attributes"] }

diff --git a/http-client/Cargo.toml b/http-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-http-client"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -56,13 +56,13 @@ trust-dns-resolver = { version = "0.21.2", optional = true }
 async-std-resolver = { version = "0.21.2", optional = true }
 async-once-cell = { version = "0.3.0", optional = true }
 
-qiniu-http = { version = "0.2.2", path = "../http" }
-qiniu-credential = { version = "0.2.2", path = "../credential" }
-qiniu-upload-token = { version = "0.2.2", path = "../upload-token" }
-qiniu-reqwest = { version = "0.2.2", path = "../http-reqwest", optional = true }
-qiniu-isahc = { version = "0.2.2", path = "../http-isahc", optional = true }
-qiniu-ureq = { version = "0.2.2", path = "../http-ureq", optional = true }
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-http = { version = "0.2.3", path = "../http" }
+qiniu-credential = { version = "0.2.3", path = "../credential" }
+qiniu-upload-token = { version = "0.2.3", path = "../upload-token" }
+qiniu-reqwest = { version = "0.2.3", path = "../http-reqwest", optional = true }
+qiniu-isahc = { version = "0.2.3", path = "../http-isahc", optional = true }
+qiniu-ureq = { version = "0.2.3", path = "../http-ureq", optional = true }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [target.'cfg(windows)'.dependencies]
 windows-sys = { version = "0.48.0", features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_IO"] }

diff --git a/http-client/src/client/resolver/c_ares_impl.rs b/http-client/src/client/resolver/c_ares_impl.rs
@@ -53,7 +53,7 @@ impl CAresResolver {
 
     /// 创建 [`c-ares`](https://c-ares.org/) 域名解析器
     #[inline]
-    #[cfg(any(feature = "async"))]
+    #[cfg(feature = "async")]
     pub fn new_with_options(
         sync_options: CAresResolverOptions,
         async_options: CAresResolverOptions,
@@ -68,7 +68,7 @@ impl CAresResolver {
     #[inline]
     pub fn new() -> CAresResolverResult<Self> {
         cfg_if! {
-            if #[cfg(any(feature = "async"))] {
+            if #[cfg(feature = "async")] {
                 Self::new_with_options(CAresResolverOptions::new(), CAresResolverOptions::new())
             } else {
                 Self::new_with_options(CAresResolverOptions::new())

diff --git a/http-client/src/client/resolver/mod.rs b/http-client/src/client/resolver/mod.rs
@@ -201,10 +201,10 @@ pub use timeout::TimeoutResolver;
 
 mod owned_resolver_options;
 
-#[cfg(any(feature = "c_ares"))]
+#[cfg(feature = "c_ares")]
 mod c_ares_impl;
 
-#[cfg(any(feature = "c_ares"))]
+#[cfg(feature = "c_ares")]
 pub use c_ares_impl::{c_ares, c_ares_resolver, CAresResolver};
 
 #[cfg(all(feature = "trust_dns", feature = "async"))]

diff --git a/http-isahc/Cargo.toml b/http-isahc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-isahc"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -16,7 +16,7 @@ keywords = ["qiniu", "storage"]
 [dependencies]
 anyhow = "1.0.41"
 isahc = { version = "1.4.0" }
-qiniu-http = { version = "0.2.2", path = "../http" }
+qiniu-http = { version = "0.2.3", path = "../http" }
 futures = { version = "0.3.16", optional = true }
 
 [features]

diff --git a/http-reqwest/Cargo.toml b/http-reqwest/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-reqwest"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -16,7 +16,7 @@ keywords = ["qiniu", "storage"]
 [dependencies]
 anyhow = "1.0.41"
 reqwest = { version = "0.11.4", features = ["blocking", "stream"] }
-qiniu-http = { version = "0.2.2", path = "../http" }
+qiniu-http = { version = "0.2.3", path = "../http" }
 bytes = { version = "1.0.1", optional = true }
 futures = { version = "0.3.16", optional = true }
 

diff --git a/http-ureq/Cargo.toml b/http-ureq/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-ureq"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -17,7 +17,7 @@ keywords = ["qiniu", "storage"]
 anyhow = "1.0.41"
 ureq = "2.5.0"
 
-qiniu-http = { version = "0.2.2", path = "../http" }
+qiniu-http = { version = "0.2.3", path = "../http" }
 
 [features]
 async = ["qiniu-http/async"]

diff --git a/http/Cargo.toml b/http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-http"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -23,7 +23,7 @@ serde = "1.0.130"
 auto_impl = "1.0.0"
 futures-lite = { version = "1.11.2", optional = true }
 
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [build-dependencies]
 rustc_version = "0.4.0"

diff --git a/objects-manager/Cargo.toml b/objects-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-objects-manager"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -28,8 +28,8 @@ async-once-cell = { version = "0.3.0", optional = true }
 dyn-clonable = "0.9.0"
 auto_impl = "1.0.0"
 
-qiniu-apis = { version = "0.2.2", path = "../apis", default-features = false }
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-apis = { version = "0.2.3", path = "../apis", default-features = false }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [dev-dependencies]
 env_logger = "0.9.0"

diff --git a/sdk-examples/Cargo.toml b/sdk-examples/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-sdk-examples"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -15,7 +15,7 @@ anyhow = "1.0.41"
 async-std = { version = "1.6.3", features = ["attributes"] }
 env_logger = "0.9.0"
 log = "0.4.14"
-qiniu-sdk = { version = "0.2.2", path = "../sdk", features = ["apis", "upload", "objects", "async", "isahc", "trust_dns"] }
+qiniu-sdk = { version = "0.2.3", path = "../sdk", features = ["apis", "upload", "objects", "async", "isahc", "trust_dns"] }
 structopt = "0.3.23"
 
 [dependencies]

diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-sdk"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -14,19 +14,19 @@ keywords = ["qiniu", "storage"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-qiniu-utils = { version = "0.2.2", path = "../utils", optional = true }
-qiniu-etag = { version = "0.2.2", path = "../etag", optional = true }
-qiniu-credential = { version = "0.2.2", path = "../credential", optional = true }
-qiniu-upload-token = { version = "0.2.2", path = "../upload-token", optional = true }
-qiniu-http = { version = "0.2.2", path = "../http", optional = true }
-qiniu-ureq = { version = "0.2.2", path = "../http-ureq", optional = true }
-qiniu-isahc = { version = "0.2.2", path = "../http-isahc", optional = true }
-qiniu-reqwest = { version = "0.2.2", path = "../http-reqwest", optional = true }
-qiniu-http-client = { version = "0.2.2", path = "../http-client", optional = true, default-features = false }
-qiniu-apis = { version = "0.2.2", path = "../apis", optional = true, default-features = false }
-qiniu-objects-manager = { version = "0.2.2", path = "../objects-manager", optional = true, default-features = false }
-qiniu-upload-manager = { version = "0.2.2", path = "../upload-manager", optional = true, default-features = false }
-qiniu-download-manager = { version = "0.2.2", path = "../download-manager", optional = true, default-features = false }
+qiniu-utils = { version = "0.2.3", path = "../utils", optional = true }
+qiniu-etag = { version = "0.2.3", path = "../etag", optional = true }
+qiniu-credential = { version = "0.2.3", path = "../credential", optional = true }
+qiniu-upload-token = { version = "0.2.3", path = "../upload-token", optional = true }
+qiniu-http = { version = "0.2.3", path = "../http", optional = true }
+qiniu-ureq = { version = "0.2.3", path = "../http-ureq", optional = true }
+qiniu-isahc = { version = "0.2.3", path = "../http-isahc", optional = true }
+qiniu-reqwest = { version = "0.2.3", path = "../http-reqwest", optional = true }
+qiniu-http-client = { version = "0.2.3", path = "../http-client", optional = true, default-features = false }
+qiniu-apis = { version = "0.2.3", path = "../apis", optional = true, default-features = false }
+qiniu-objects-manager = { version = "0.2.3", path = "../objects-manager", optional = true, default-features = false }
+qiniu-upload-manager = { version = "0.2.3", path = "../upload-manager", optional = true, default-features = false }
+qiniu-download-manager = { version = "0.2.3", path = "../download-manager", optional = true, default-features = false }
 
 [features]
 default = ["ureq"]

diff --git a/upload-manager/Cargo.toml b/upload-manager/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-upload-manager"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -36,9 +36,9 @@ futures = { version = "0.3.5", optional = true }
 async-once-cell = { version = "0.3.0", optional = true }
 async-std = { version = "1.10.0", optional = true }
 
-qiniu-apis = { version = "0.2.2", path = "../apis", default-features = false }
-qiniu-upload-token = { version = "0.2.2", path = "../upload-token" }
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-apis = { version = "0.2.3", path = "../apis", default-features = false }
+qiniu-upload-token = { version = "0.2.3", path = "../upload-token" }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [dev-dependencies]
 env_logger = "0.9.0"

diff --git a/upload-token/Cargo.toml b/upload-token/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-upload-token"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"
@@ -24,8 +24,8 @@ serde = { version = "1.0.130", features = ["derive"] }
 auto_impl = "1.0.0"
 futures = { version = "0.3.16", optional = true }
 
-qiniu-credential = { version = "0.2.2", path = "../credential" }
-qiniu-utils = { version = "0.2.2", path = "../utils" }
+qiniu-credential = { version = "0.2.3", path = "../credential" }
+qiniu-utils = { version = "0.2.3", path = "../utils" }
 
 [dev-dependencies]
 async-std = { version = "1.6.3", features = ["attributes"] }

diff --git a/utils/Cargo.toml b/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qiniu-utils"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Rong Zhou <[email protected]>", "Shanghai Qiniu Information Technologies Co., Ltd."]
 edition = "2021"
 rust-version = "1.60.0"