Merge pull request #24 from zhangzqs/master

change list api default version

Author: bachue

http-client/Cargo.toml

@@ -27,7 +27,7 @@ form_urlencoded = "1.0.1"
 url = "2.2.2"
 ipnet = "2.3.1"
 anyhow = "1.0.41"
-fs4 = "0.6.1"
+fs4 = { version = "0.6.1" }
 assert-impl = "0.1.3"
 crossbeam-channel = "0.5.1"
 crossbeam-queue = "0.3.2"
@@ -47,7 +47,7 @@ smart-default = "0.6.0"
 dyn-clonable = "0.9.0"
 auto_impl = "1.0.0"
 num-rational = { version = "0.3.0", default-features = false }
-c-ares = { version ="7.2.0", optional = true }
+c-ares = { version ="=7.2.0", optional = true }
 c-ares-resolver = { version ="7.1.3", optional = true }
 futures = { version = "0.3.5", optional = true }
 futures-timer = { version = "3.0.2", optional = true }
@@ -64,6 +64,9 @@ 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" }
 
+[target.'cfg(windows)'.dependencies]
+windows-sys = { version = "0.48.0", features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_IO"] }
+
 [dev-dependencies]
 async-std = { version = "1.9.0", features = ["attributes"] }
 tokio = { version = "1", features = ["full"] }

objects-manager/src/list.rs

@@ -155,15 +155,15 @@ impl Debug for ListIter<'_> {
 
 /// 列举 API 版本
 ///
-/// 目前支持 V1 和 V2，默认为 V2
+/// 目前支持 V1 和 V2，默认为 V1
 #[derive(Copy, Clone, Debug, SmartDefault)]
 #[non_exhaustive]
 pub enum ListVersion {
     /// 列举 API V1
+    #[default]
     V1,
 
     /// 列举 API V2
-    #[default]
     V2,
 }
 

objects-manager/src/operation.rs

@@ -1049,7 +1049,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         let object = bucket.stat_object("fakeobjectname").async_call().await?.into_body();
         assert_eq!(object.get_hash_as_str(), "fakehash");
         assert_eq!(object.get_size_as_u64(), 12345u64);
@@ -1085,7 +1085,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket
             .copy_object_to("fakeobjectname", &get_bucket_name(), "fakeobjectname2")
             .is_force(true)
@@ -1123,7 +1123,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket
             .move_object_to("fakeobjectname", &get_bucket_name(), "fakeobjectname2")
             .async_call()
@@ -1159,7 +1159,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket.delete_object("fakeobjectname").async_call().await?;
 
         Ok(())
@@ -1192,7 +1192,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket.restore_archived_object("fakeobjectname", 7).async_call().await?;
 
         Ok(())
@@ -1225,7 +1225,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket
             .set_object_type("fakeobjectname", FileType::Archive)
             .async_call()
@@ -1261,7 +1261,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket.modify_object_status("fakeobjectname", true).async_call().await?;
 
         Ok(())
@@ -1297,7 +1297,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket
             .modify_object_metadata("fakeobjectname", mime::TEXT_PLAIN)
             .add_metadata("MetaKey-1", "MetaValue-1")
@@ -1336,7 +1336,7 @@ mod tests {
             }
         }
 
-        let bucket = get_bucket(FakeHttpCaller::default());
+        let bucket = get_bucket(FakeHttpCaller);
         bucket
             .modify_object_life_cycle("fakeobjectname")
             .ia_after_days(AfterDays::new(1))

upload-token/src/upload_token.rs

@@ -724,8 +724,8 @@ macro_rules! sync_method {
         };
 
         #[allow(unused_lifetimes)]
-        fn update_cache<'a>(
-            provider: &'a CachedUploadTokenProvider<impl UploadTokenProvider + Clone>,
+        fn update_cache(
+            provider: &CachedUploadTokenProvider<impl UploadTokenProvider + Clone>,
             opts: $opts_type,
         ) -> $return_type {
             let mut guard = provider.sync_cache.0.$cache_field.write().unwrap();
@@ -802,7 +802,7 @@ impl<P: UploadTokenProvider + Clone> UploadTokenProvider for CachedUploadTokenPr
             opts,
             ToStringOptions,
             to_token_string,
-            ToStringResult<Cow<'a, str>>
+            ToStringResult<Cow<str>>
         )
     }