feat(decode): traits change to decode

tu6ge · Dec 18, 2022 · a9b3a8d · a9b3a8d
1 parent c13ca08
commit a9b3a8d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/examples/parse_xml.rs b/examples/parse_xml.rs
@@ -1,4 +1,4 @@
-use aliyun_oss_client::traits::{RefineObject, RefineObjectList};
+use aliyun_oss_client::decode::{RefineObject, RefineObjectList};
 use thiserror::Error;
 
 struct MyFile {

diff --git a/src/bucket.rs b/src/bucket.rs
@@ -5,12 +5,12 @@ use crate::client::ClientArc;
 #[cfg(feature = "blocking")]
 use crate::client::ClientRc;
 use crate::config::BucketBase;
+use crate::decode::{RefineBucket, RefineBucketList, RefineObjectList};
 use crate::errors::{OssError, OssResult};
 #[cfg(feature = "blocking")]
 use crate::file::blocking::AlignBuilder as BlockingAlignBuilder;
 use crate::file::AlignBuilder;
 use crate::object::{Object, ObjectList};
-use crate::traits::{RefineBucket, RefineBucketList, RefineObjectList};
 use crate::types::{
     CanonicalizedResource, InvalidEndPoint, Query, QueryKey, QueryValue, BUCKET_INFO,
 };

diff --git a/src/lib.rs b/src/lib.rs
@@ -243,9 +243,14 @@ pub mod blocking;
 /// 封装了 reqwest::RequestBuilder 模块
 pub mod builder;
 
-/// 解析 aliyun OSS 接口返回的 xml 格式的各种 trait
+/// 解析 aliyun OSS 接口返回的 xml
+#[deprecated(since = "0.11.0", note = "plase use decode mod")]
 pub mod traits;
 
+/// 解析 aliyun OSS 接口返回的 xml
+#[path = "traits.rs"]
+pub mod decode;
+
 /// 异常处理模块
 pub mod errors;
 

diff --git a/src/object.rs b/src/object.rs
@@ -5,11 +5,11 @@ use crate::client::ClientArc;
 #[cfg(feature = "blocking")]
 use crate::client::ClientRc;
 use crate::config::{BucketBase, ObjectBase, ObjectPath};
+use crate::decode::{RefineObject, RefineObjectList};
 use crate::errors::{OssError, OssResult};
 #[cfg(feature = "blocking")]
 use crate::file::blocking::AlignBuilder as BlockingAlignBuilder;
 use crate::file::AlignBuilder;
-use crate::traits::{RefineObject, RefineObjectList};
 use crate::types::{
     CanonicalizedResource, Query, QueryKey, QueryValue, UrlQuery, CONTINUATION_TOKEN,
 };
@@ -567,7 +567,7 @@ impl Client {
     /// ```rust
     /// use aliyun_oss_client::{
     ///     builder::BuilderError,
-    ///     traits::{RefineObject, RefineObjectList},
+    ///     decode::{RefineObject, RefineObjectList},
     ///     Client,
     /// };
     /// use dotenv::dotenv;

diff --git a/src/tests/traits.rs b/src/tests/traits.rs
@@ -12,8 +12,8 @@ mod object_list_xml {
 
     #[test]
     fn from_xml() {
-        use crate::traits::RefineObject;
-        use crate::traits::RefineObjectList;
+        use crate::decode::RefineObject;
+        use crate::decode::RefineObjectList;
 
         #[derive(Default)]
         struct ObjectA {}
@@ -170,8 +170,8 @@ mod object_list_xml {
     #[cfg(feature = "bench")]
     #[bench]
     fn from_xml_bench(b: &mut test::Bencher) {
-        use crate::traits::RefineObject;
-        use crate::traits::RefineObjectList;
+        use crate::decode::RefineObject;
+        use crate::decode::RefineObjectList;
 
         #[derive(Default)]
         struct ObjectA {}
@@ -316,8 +316,8 @@ mod object_list_xml {
     #[cfg(feature = "bench")]
     #[bench]
     fn from_xml_bench_real_object(b: &mut test::Bencher) {
-        use crate::traits::RefineObject;
-        use crate::traits::RefineObjectList;
+        use crate::decode::RefineObject;
+        use crate::decode::RefineObjectList;
 
         let xml = r#"<?xml version="1.0" encoding="UTF-8"?>
         <ListBucketResult>
@@ -362,8 +362,8 @@ mod object_list_xml {
 
     #[test]
     fn from_xml_has_next() {
-        use crate::traits::RefineObject;
-        use crate::traits::RefineObjectList;
+        use crate::decode::RefineObject;
+        use crate::decode::RefineObjectList;
 
         #[derive(Default)]
         struct ObjectA {}
@@ -435,7 +435,7 @@ mod bucket_xml {
 
     #[test]
     fn from_xml() {
-        use crate::traits::RefineBucket;
+        use crate::decode::RefineBucket;
 
         struct BucketA {}
 
@@ -512,7 +512,7 @@ mod bucket_list_xml {
 
     #[test]
     fn from_xml() {
-        use crate::traits::{RefineBucket, RefineBucketList};
+        use crate::decode::{RefineBucket, RefineBucketList};
 
         #[derive(Default)]
         struct BucketA {}

diff --git a/src/traits.rs b/src/traits.rs
@@ -5,7 +5,7 @@
 //!
 //! ## 示例
 //! ```
-//! use aliyun_oss_client::traits::{RefineObject, RefineObjectList};
+//! use aliyun_oss_client::decode::{RefineObject, RefineObjectList};
 //! use thiserror::Error;
 //!
 //! struct MyFile {