This is an automated email from the ASF dual-hosted git repository. koushiro pushed a commit to branch some-renaming in repository https://gitbox.apache.org/repos/asf/opendal.git
commit f7187352399a6f53f814123180af4193e8b58ea6 Author: koushiro <[email protected]> AuthorDate: Wed Nov 5 15:52:22 2025 +0800 chore: rename delete module => deleter module --- core/src/services/aliyun_drive/backend.rs | 2 +- core/src/services/aliyun_drive/{delete.rs => deleter.rs} | 0 core/src/services/aliyun_drive/mod.rs | 11 +++++------ core/src/services/alluxio/backend.rs | 2 +- core/src/services/alluxio/{delete.rs => deleter.rs} | 0 core/src/services/alluxio/mod.rs | 11 +++++------ core/src/services/azblob/backend.rs | 2 +- core/src/services/azblob/{delete.rs => deleter.rs} | 0 core/src/services/azblob/mod.rs | 8 ++++---- core/src/services/azdls/backend.rs | 2 +- core/src/services/azdls/{delete.rs => deleter.rs} | 0 core/src/services/azdls/mod.rs | 8 ++++---- core/src/services/azfile/backend.rs | 2 +- core/src/services/azfile/{delete.rs => deleter.rs} | 0 core/src/services/azfile/mod.rs | 11 +++++------ core/src/services/b2/backend.rs | 2 +- core/src/services/b2/{delete.rs => deleter.rs} | 0 core/src/services/b2/mod.rs | 9 ++++----- core/src/services/cacache/backend.rs | 2 +- core/src/services/cacache/config.rs | 2 -- core/src/services/cacache/{delete.rs => deleter.rs} | 0 core/src/services/cacache/mod.rs | 8 ++++---- core/src/services/cloudflare_kv/backend.rs | 2 +- core/src/services/cloudflare_kv/{delete.rs => deleter.rs} | 0 core/src/services/cloudflare_kv/mod.rs | 11 ++++++----- core/src/services/compfs/backend.rs | 4 ++-- core/src/services/compfs/config.rs | 2 -- core/src/services/compfs/{delete.rs => deleter.rs} | 0 core/src/services/compfs/mod.rs | 10 +++++----- core/src/services/cos/backend.rs | 2 +- core/src/services/cos/{delete.rs => deleter.rs} | 0 core/src/services/cos/mod.rs | 9 ++++----- core/src/services/d1/mod.rs | 5 ++--- core/src/services/dashmap/backend.rs | 2 +- core/src/services/dashmap/config.rs | 2 -- core/src/services/dashmap/{delete.rs => deleter.rs} | 0 core/src/services/dashmap/mod.rs | 8 ++++---- core/src/services/dbfs/backend.rs | 2 +- core/src/services/dbfs/{delete.rs => deleter.rs} | 0 core/src/services/dbfs/mod.rs | 10 +++++----- core/src/services/dropbox/backend.rs | 2 +- core/src/services/dropbox/{delete.rs => deleter.rs} | 0 core/src/services/dropbox/mod.rs | 10 +++++----- core/src/services/etcd/mod.rs | 8 +++++--- core/src/services/foundationdb/mod.rs | 3 +-- core/src/services/fs/backend.rs | 2 +- core/src/services/fs/{delete.rs => deleter.rs} | 0 core/src/services/fs/mod.rs | 8 ++++---- core/src/services/ftp/backend.rs | 2 +- core/src/services/ftp/{delete.rs => deleter.rs} | 0 core/src/services/ftp/mod.rs | 13 ++++++------- core/src/services/gcs/backend.rs | 2 +- core/src/services/gcs/{delete.rs => deleter.rs} | 0 core/src/services/gcs/mod.rs | 8 ++++---- core/src/services/gdrive/backend.rs | 2 +- core/src/services/gdrive/{delete.rs => deleter.rs} | 0 core/src/services/gdrive/mod.rs | 10 +++++----- core/src/services/ghac/mod.rs | 11 +++++------ core/src/services/github/backend.rs | 2 +- core/src/services/github/{delete.rs => deleter.rs} | 0 core/src/services/github/mod.rs | 10 +++++----- core/src/services/gridfs/mod.rs | 3 +-- core/src/services/hdfs/backend.rs | 2 +- core/src/services/hdfs/{delete.rs => deleter.rs} | 0 core/src/services/hdfs/mod.rs | 10 +++++----- core/src/services/hdfs_native/backend.rs | 2 +- core/src/services/hdfs_native/{delete.rs => deleter.rs} | 0 core/src/services/hdfs_native/mod.rs | 11 +++++------ core/src/services/http/mod.rs | 8 ++++---- core/src/services/huggingface/mod.rs | 8 ++++---- core/src/services/ipfs/config.rs | 2 -- core/src/services/ipfs/mod.rs | 10 +++++----- core/src/services/ipmfs/backend.rs | 2 +- core/src/services/ipmfs/{delete.rs => deleter.rs} | 0 core/src/services/ipmfs/mod.rs | 10 +++++----- core/src/services/koofr/backend.rs | 2 +- core/src/services/koofr/{delete.rs => deleter.rs} | 0 core/src/services/koofr/mod.rs | 10 +++++----- core/src/services/lakefs/backend.rs | 2 +- core/src/services/lakefs/{delete.rs => deleter.rs} | 0 core/src/services/lakefs/mod.rs | 10 +++++----- core/src/services/memcached/mod.rs | 3 +-- core/src/services/memory/backend.rs | 2 +- core/src/services/memory/config.rs | 2 -- core/src/services/memory/{delete.rs => deleter.rs} | 0 core/src/services/memory/mod.rs | 10 +++++----- core/src/services/mini_moka/backend.rs | 2 +- core/src/services/mini_moka/{delete.rs => deleter.rs} | 0 core/src/services/mini_moka/mod.rs | 8 ++++---- core/src/services/moka/backend.rs | 2 +- core/src/services/moka/{delete.rs => deleter.rs} | 0 core/src/services/moka/mod.rs | 11 +++++------ core/src/services/mongodb/mod.rs | 3 +-- core/src/services/monoiofs/backend.rs | 2 +- core/src/services/monoiofs/{delete.rs => deleter.rs} | 0 core/src/services/monoiofs/mod.rs | 10 +++++----- core/src/services/mysql/mod.rs | 3 +-- core/src/services/obs/backend.rs | 2 +- core/src/services/obs/{delete.rs => deleter.rs} | 0 core/src/services/obs/mod.rs | 8 ++++---- core/src/services/onedrive/backend.rs | 2 +- core/src/services/onedrive/{delete.rs => deleter.rs} | 0 core/src/services/onedrive/mod.rs | 10 +++++----- core/src/services/opfs/mod.rs | 5 +---- core/src/services/oss/backend.rs | 2 +- core/src/services/oss/{delete.rs => deleter.rs} | 0 core/src/services/oss/mod.rs | 8 ++++---- core/src/services/pcloud/backend.rs | 2 +- core/src/services/pcloud/{delete.rs => deleter.rs} | 0 core/src/services/pcloud/mod.rs | 10 +++++----- core/src/services/persy/mod.rs | 3 +-- core/src/services/postgresql/mod.rs | 3 +-- core/src/services/redb/config.rs | 2 -- core/src/services/redb/mod.rs | 3 +-- core/src/services/redis/mod.rs | 6 +++--- core/src/services/rocksdb/mod.rs | 3 +-- core/src/services/s3/backend.rs | 2 +- core/src/services/s3/{delete.rs => deleter.rs} | 0 core/src/services/s3/mod.rs | 8 ++++---- core/src/services/seafile/backend.rs | 2 +- core/src/services/seafile/{delete.rs => deleter.rs} | 0 core/src/services/seafile/mod.rs | 10 +++++----- core/src/services/sftp/backend.rs | 2 +- core/src/services/sftp/{delete.rs => deleter.rs} | 0 core/src/services/sftp/mod.rs | 12 ++++++------ core/src/services/sled/mod.rs | 3 +-- core/src/services/sqlite/backend.rs | 2 +- core/src/services/sqlite/{delete.rs => deleter.rs} | 0 core/src/services/sqlite/mod.rs | 12 ++++-------- core/src/services/surrealdb/mod.rs | 3 +-- core/src/services/swift/backend.rs | 2 +- core/src/services/swift/{delete.rs => deleter.rs} | 0 core/src/services/swift/mod.rs | 10 +++++----- core/src/services/tikv/mod.rs | 3 +-- core/src/services/upyun/backend.rs | 2 +- core/src/services/upyun/{delete.rs => deleter.rs} | 0 core/src/services/upyun/mod.rs | 8 ++++---- core/src/services/vercel_artifacts/mod.rs | 8 ++++---- core/src/services/vercel_blob/backend.rs | 2 +- core/src/services/vercel_blob/{delete.rs => deleter.rs} | 0 core/src/services/vercel_blob/mod.rs | 10 +++++----- core/src/services/webdav/backend.rs | 2 +- core/src/services/webdav/{delete.rs => deleter.rs} | 0 core/src/services/webdav/mod.rs | 10 +++++----- core/src/services/webhdfs/backend.rs | 2 +- core/src/services/webhdfs/{delete.rs => deleter.rs} | 0 core/src/services/webhdfs/mod.rs | 13 ++++++------- core/src/services/yandex_disk/backend.rs | 2 +- core/src/services/yandex_disk/{delete.rs => deleter.rs} | 0 core/src/services/yandex_disk/mod.rs | 10 +++++----- 150 files changed, 282 insertions(+), 321 deletions(-) diff --git a/core/src/services/aliyun_drive/backend.rs b/core/src/services/aliyun_drive/backend.rs index 63eaf5803..6c5b96f44 100644 --- a/core/src/services/aliyun_drive/backend.rs +++ b/core/src/services/aliyun_drive/backend.rs @@ -27,7 +27,7 @@ use tokio::sync::Mutex; use super::ALIYUN_DRIVE_SCHEME; use super::config::AliyunDriveConfig; use super::core::*; -use super::delete::AliyunDriveDeleter; +use super::deleter::AliyunDriveDeleter; use super::error::parse_error; use super::lister::AliyunDriveLister; use super::lister::AliyunDriveParent; diff --git a/core/src/services/aliyun_drive/delete.rs b/core/src/services/aliyun_drive/deleter.rs similarity index 100% rename from core/src/services/aliyun_drive/delete.rs rename to core/src/services/aliyun_drive/deleter.rs diff --git a/core/src/services/aliyun_drive/mod.rs b/core/src/services/aliyun_drive/mod.rs index a2c9569e9..a6c7f7fd8 100644 --- a/core/src/services/aliyun_drive/mod.rs +++ b/core/src/services/aliyun_drive/mod.rs @@ -16,16 +16,15 @@ // under the License. /// Default scheme for aliyun_drive service. -pub(super) const ALIYUN_DRIVE_SCHEME: &str = "aliyun-drive"; -mod core; +pub const ALIYUN_DRIVE_SCHEME: &str = "aliyun-drive"; mod backend; -mod delete; +mod config; +mod core; +mod deleter; mod error; mod lister; mod writer; -pub use backend::AliyunDriveBuilder as AliyunDrive; - -mod config; +pub use backend::AliyunDriveBuilder as AliyunDrive; pub use config::AliyunDriveConfig; diff --git a/core/src/services/alluxio/backend.rs b/core/src/services/alluxio/backend.rs index df5776fa0..a3bf80a37 100644 --- a/core/src/services/alluxio/backend.rs +++ b/core/src/services/alluxio/backend.rs @@ -24,7 +24,7 @@ use log::debug; use super::ALLUXIO_SCHEME; use super::config::AlluxioConfig; use super::core::AlluxioCore; -use super::delete::AlluxioDeleter; +use super::deleter::AlluxioDeleter; use super::error::parse_error; use super::lister::AlluxioLister; use super::writer::AlluxioWriter; diff --git a/core/src/services/alluxio/delete.rs b/core/src/services/alluxio/deleter.rs similarity index 100% rename from core/src/services/alluxio/delete.rs rename to core/src/services/alluxio/deleter.rs diff --git a/core/src/services/alluxio/mod.rs b/core/src/services/alluxio/mod.rs index d0af06b3b..6fa29ade2 100644 --- a/core/src/services/alluxio/mod.rs +++ b/core/src/services/alluxio/mod.rs @@ -16,16 +16,15 @@ // under the License. /// Default scheme for alluxio service. -pub(super) const ALLUXIO_SCHEME: &str = "alluxio"; +pub const ALLUXIO_SCHEME: &str = "alluxio"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::AlluxioBuilder as Alluxio; - -mod config; - pub use config::AlluxioConfig; diff --git a/core/src/services/azblob/backend.rs b/core/src/services/azblob/backend.rs index 98e5aafa1..043a6396f 100644 --- a/core/src/services/azblob/backend.rs +++ b/core/src/services/azblob/backend.rs @@ -34,7 +34,7 @@ use super::config::AzblobConfig; use super::core::AzblobCore; use super::core::constants::X_MS_META_PREFIX; use super::core::constants::X_MS_VERSION_ID; -use super::delete::AzblobDeleter; +use super::deleter::AzblobDeleter; use super::error::parse_error; use super::lister::AzblobLister; use super::writer::AzblobWriter; diff --git a/core/src/services/azblob/delete.rs b/core/src/services/azblob/deleter.rs similarity index 100% rename from core/src/services/azblob/delete.rs rename to core/src/services/azblob/deleter.rs diff --git a/core/src/services/azblob/mod.rs b/core/src/services/azblob/mod.rs index ce6fa88a3..d4c630c89 100644 --- a/core/src/services/azblob/mod.rs +++ b/core/src/services/azblob/mod.rs @@ -17,14 +17,14 @@ /// Default scheme for azblob service. pub const AZBLOB_SCHEME: &str = "azblob"; + +mod backend; +mod config; pub(crate) mod core; -mod delete; +mod deleter; mod error; mod lister; pub(crate) mod writer; -mod backend; pub use backend::AzblobBuilder as Azblob; - -mod config; pub use config::AzblobConfig; diff --git a/core/src/services/azdls/backend.rs b/core/src/services/azdls/backend.rs index 4689e1ca6..f66f79e01 100644 --- a/core/src/services/azdls/backend.rs +++ b/core/src/services/azdls/backend.rs @@ -29,7 +29,7 @@ use super::AZDLS_SCHEME; use super::config::AzdlsConfig; use super::core::AzdlsCore; use super::core::DIRECTORY; -use super::delete::AzdlsDeleter; +use super::deleter::AzdlsDeleter; use super::error::parse_error; use super::lister::AzdlsLister; use super::writer::AzdlsWriter; diff --git a/core/src/services/azdls/delete.rs b/core/src/services/azdls/deleter.rs similarity index 100% rename from core/src/services/azdls/delete.rs rename to core/src/services/azdls/deleter.rs diff --git a/core/src/services/azdls/mod.rs b/core/src/services/azdls/mod.rs index 79ce34f12..90dc9ab68 100644 --- a/core/src/services/azdls/mod.rs +++ b/core/src/services/azdls/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for azdls service. -pub(super) const AZDLS_SCHEME: &str = "azdls"; +pub const AZDLS_SCHEME: &str = "azdls"; + mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; pub use backend::AzdlsBuilder as Azdls; - -mod config; pub use config::AzdlsConfig; diff --git a/core/src/services/azfile/backend.rs b/core/src/services/azfile/backend.rs index 5d9962211..f8a1c6206 100644 --- a/core/src/services/azfile/backend.rs +++ b/core/src/services/azfile/backend.rs @@ -28,7 +28,7 @@ use reqsign::AzureStorageSigner; use super::AZFILE_SCHEME; use super::config::AzfileConfig; use super::core::AzfileCore; -use super::delete::AzfileDeleter; +use super::deleter::AzfileDeleter; use super::error::parse_error; use super::lister::AzfileLister; use super::writer::AzfileWriter; diff --git a/core/src/services/azfile/delete.rs b/core/src/services/azfile/deleter.rs similarity index 100% rename from core/src/services/azfile/delete.rs rename to core/src/services/azfile/deleter.rs diff --git a/core/src/services/azfile/mod.rs b/core/src/services/azfile/mod.rs index fbd6826a4..971b9103e 100644 --- a/core/src/services/azfile/mod.rs +++ b/core/src/services/azfile/mod.rs @@ -16,16 +16,15 @@ // under the License. /// Default scheme for azfile service. -pub(super) const AZFILE_SCHEME: &str = "azfile"; +pub const AZFILE_SCHEME: &str = "azfile"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::AzfileBuilder as Azfile; - -mod config; - pub use config::AzfileConfig; diff --git a/core/src/services/b2/backend.rs b/core/src/services/b2/backend.rs index bf21b41bf..344b52db0 100644 --- a/core/src/services/b2/backend.rs +++ b/core/src/services/b2/backend.rs @@ -30,7 +30,7 @@ use super::core::B2Core; use super::core::B2Signer; use super::core::constants; use super::core::parse_file_info; -use super::delete::B2Deleter; +use super::deleter::B2Deleter; use super::error::parse_error; use super::lister::B2Lister; use super::writer::B2Writer; diff --git a/core/src/services/b2/delete.rs b/core/src/services/b2/deleter.rs similarity index 100% rename from core/src/services/b2/delete.rs rename to core/src/services/b2/deleter.rs diff --git a/core/src/services/b2/mod.rs b/core/src/services/b2/mod.rs index 63e421d9d..7cd38bc92 100644 --- a/core/src/services/b2/mod.rs +++ b/core/src/services/b2/mod.rs @@ -17,15 +17,14 @@ /// Default scheme for b2 service. pub const B2_SCHEME: &str = "b2"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::B2Builder as B2; - -mod config; - pub use config::B2Config; diff --git a/core/src/services/cacache/backend.rs b/core/src/services/cacache/backend.rs index 34ef20a3e..5094f723a 100644 --- a/core/src/services/cacache/backend.rs +++ b/core/src/services/cacache/backend.rs @@ -20,7 +20,7 @@ use std::sync::Arc; use super::CACACHE_SCHEME; use super::config::CacacheConfig; use super::core::CacacheCore; -use super::delete::CacacheDeleter; +use super::deleter::CacacheDeleter; use super::writer::CacacheWriter; use crate::raw::*; use crate::*; diff --git a/core/src/services/cacache/config.rs b/core/src/services/cacache/config.rs index c2366baf4..8a48df903 100644 --- a/core/src/services/cacache/config.rs +++ b/core/src/services/cacache/config.rs @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::Debug; - use serde::Deserialize; use serde::Serialize; diff --git a/core/src/services/cacache/delete.rs b/core/src/services/cacache/deleter.rs similarity index 100% rename from core/src/services/cacache/delete.rs rename to core/src/services/cacache/deleter.rs diff --git a/core/src/services/cacache/mod.rs b/core/src/services/cacache/mod.rs index bb618f4e4..f699c57f7 100644 --- a/core/src/services/cacache/mod.rs +++ b/core/src/services/cacache/mod.rs @@ -16,13 +16,13 @@ // under the License. /// Default scheme for cacache service. -pub(super) const CACACHE_SCHEME: &str = "cacache"; +pub const CACACHE_SCHEME: &str = "cacache"; + mod backend; +mod config; mod core; -mod delete; +mod deleter; mod writer; pub use backend::CacacheBuilder as Cacache; - -mod config; pub use config::CacacheConfig; diff --git a/core/src/services/cloudflare_kv/backend.rs b/core/src/services/cloudflare_kv/backend.rs index 1afb8c09a..e7a1faf90 100644 --- a/core/src/services/cloudflare_kv/backend.rs +++ b/core/src/services/cloudflare_kv/backend.rs @@ -25,7 +25,7 @@ use http::StatusCode; use super::CLOUDFLARE_KV_SCHEME; use super::config::CloudflareKvConfig; use super::core::CloudflareKvCore; -use super::delete::CloudflareKvDeleter; +use super::deleter::CloudflareKvDeleter; use super::error::parse_error; use super::lister::CloudflareKvLister; use super::model::*; diff --git a/core/src/services/cloudflare_kv/delete.rs b/core/src/services/cloudflare_kv/deleter.rs similarity index 100% rename from core/src/services/cloudflare_kv/delete.rs rename to core/src/services/cloudflare_kv/deleter.rs diff --git a/core/src/services/cloudflare_kv/mod.rs b/core/src/services/cloudflare_kv/mod.rs index 5d727ff3e..da5ed5b25 100644 --- a/core/src/services/cloudflare_kv/mod.rs +++ b/core/src/services/cloudflare_kv/mod.rs @@ -15,16 +15,17 @@ // specific language governing permissions and limitations // under the License. -pub(super) const CLOUDFLARE_KV_SCHEME: &str = "cloudflare-kv"; -mod error; +/// Default scheme for cloudflare-kv service. +pub const CLOUDFLARE_KV_SCHEME: &str = "cloudflare-kv"; mod backend; +mod config; mod core; -mod delete; +mod deleter; +mod error; mod lister; mod model; mod writer; -pub use backend::CloudflareKvBuilder as CloudflareKv; -mod config; +pub use backend::CloudflareKvBuilder as CloudflareKv; pub use config::CloudflareKvConfig; diff --git a/core/src/services/compfs/backend.rs b/core/src/services/compfs/backend.rs index 463323153..7d9d7c62e 100644 --- a/core/src/services/compfs/backend.rs +++ b/core/src/services/compfs/backend.rs @@ -24,7 +24,7 @@ use compio::fs::OpenOptions; use super::COMPFS_SCHEME; use super::config::CompfsConfig; use super::core::CompfsCore; -use super::delete::CompfsDeleter; +use super::deleter::CompfsDeleter; use super::lister::CompfsLister; use super::reader::CompfsReader; use super::writer::CompfsWriter; @@ -118,7 +118,7 @@ impl Builder for CompfsBuilder { } } -#[derive(Debug)] +#[derive(Clone, Debug)] pub struct CompfsBackend { core: Arc<CompfsCore>, } diff --git a/core/src/services/compfs/config.rs b/core/src/services/compfs/config.rs index 1f54bb430..88991c024 100644 --- a/core/src/services/compfs/config.rs +++ b/core/src/services/compfs/config.rs @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::Debug; - use serde::Deserialize; use serde::Serialize; diff --git a/core/src/services/compfs/delete.rs b/core/src/services/compfs/deleter.rs similarity index 100% rename from core/src/services/compfs/delete.rs rename to core/src/services/compfs/deleter.rs diff --git a/core/src/services/compfs/mod.rs b/core/src/services/compfs/mod.rs index 9a4ad4f63..00c909c78 100644 --- a/core/src/services/compfs/mod.rs +++ b/core/src/services/compfs/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for compfs service. -pub(super) const COMPFS_SCHEME: &str = "compfs"; +pub const COMPFS_SCHEME: &str = "compfs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod lister; mod reader; mod writer; -mod backend; pub use backend::CompfsBuilder as Compfs; - -mod config; pub use config::CompfsConfig; diff --git a/core/src/services/cos/backend.rs b/core/src/services/cos/backend.rs index bd3fec429..542fa9464 100644 --- a/core/src/services/cos/backend.rs +++ b/core/src/services/cos/backend.rs @@ -29,7 +29,7 @@ use reqsign::TencentCosSigner; use super::COS_SCHEME; use super::config::CosConfig; use super::core::*; -use super::delete::CosDeleter; +use super::deleter::CosDeleter; use super::error::parse_error; use super::lister::CosLister; use super::lister::CosListers; diff --git a/core/src/services/cos/delete.rs b/core/src/services/cos/deleter.rs similarity index 100% rename from core/src/services/cos/delete.rs rename to core/src/services/cos/deleter.rs diff --git a/core/src/services/cos/mod.rs b/core/src/services/cos/mod.rs index 2837cc775..d4c22e003 100644 --- a/core/src/services/cos/mod.rs +++ b/core/src/services/cos/mod.rs @@ -17,15 +17,14 @@ /// Default scheme for cos service. pub const COS_SCHEME: &str = "cos"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::CosBuilder as Cos; - -mod config; - pub use config::CosConfig; diff --git a/core/src/services/d1/mod.rs b/core/src/services/d1/mod.rs index 15e6240ae..8dca0baf6 100644 --- a/core/src/services/d1/mod.rs +++ b/core/src/services/d1/mod.rs @@ -15,14 +15,13 @@ // specific language governing permissions and limitations // under the License. +mod backend; +mod config; mod core; mod deleter; mod error; mod model; mod writer; -mod backend; pub use backend::D1Builder as D1; - -mod config; pub use config::D1Config; diff --git a/core/src/services/dashmap/backend.rs b/core/src/services/dashmap/backend.rs index 9315c46bb..b16d7a44d 100644 --- a/core/src/services/dashmap/backend.rs +++ b/core/src/services/dashmap/backend.rs @@ -23,7 +23,7 @@ use log::debug; use super::DASHMAP_SCHEME; use super::config::DashmapConfig; use super::core::DashmapCore; -use super::delete::DashmapDeleter; +use super::deleter::DashmapDeleter; use super::lister::DashmapLister; use super::writer::DashmapWriter; use crate::raw::*; diff --git a/core/src/services/dashmap/config.rs b/core/src/services/dashmap/config.rs index da4eba492..d3754ca39 100644 --- a/core/src/services/dashmap/config.rs +++ b/core/src/services/dashmap/config.rs @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::Debug; - use serde::Deserialize; use serde::Serialize; diff --git a/core/src/services/dashmap/delete.rs b/core/src/services/dashmap/deleter.rs similarity index 100% rename from core/src/services/dashmap/delete.rs rename to core/src/services/dashmap/deleter.rs diff --git a/core/src/services/dashmap/mod.rs b/core/src/services/dashmap/mod.rs index 6f24ca5f9..1357e67ff 100644 --- a/core/src/services/dashmap/mod.rs +++ b/core/src/services/dashmap/mod.rs @@ -16,14 +16,14 @@ // under the License. /// Default scheme for dashmap service. -pub(super) const DASHMAP_SCHEME: &str = "dashmap"; +pub const DASHMAP_SCHEME: &str = "dashmap"; + mod backend; +mod config; mod core; -mod delete; +mod deleter; mod lister; mod writer; pub use backend::DashmapBuilder as Dashmap; - -mod config; pub use config::DashmapConfig; diff --git a/core/src/services/dbfs/backend.rs b/core/src/services/dbfs/backend.rs index 7c67f5f97..daf5c360f 100644 --- a/core/src/services/dbfs/backend.rs +++ b/core/src/services/dbfs/backend.rs @@ -24,7 +24,7 @@ use serde::Deserialize; use super::DBFS_SCHEME; use super::core::DbfsCore; -use super::delete::DbfsDeleter; +use super::deleter::DbfsDeleter; use super::error::parse_error; use super::lister::DbfsLister; use super::writer::DbfsWriter; diff --git a/core/src/services/dbfs/delete.rs b/core/src/services/dbfs/deleter.rs similarity index 100% rename from core/src/services/dbfs/delete.rs rename to core/src/services/dbfs/deleter.rs diff --git a/core/src/services/dbfs/mod.rs b/core/src/services/dbfs/mod.rs index a2f81b9cd..c09175cb2 100644 --- a/core/src/services/dbfs/mod.rs +++ b/core/src/services/dbfs/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for dbfs service. -pub(super) const DBFS_SCHEME: &str = "dbfs"; +pub const DBFS_SCHEME: &str = "dbfs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::DbfsBuilder as Dbfs; - -mod config; pub use config::DbfsConfig; diff --git a/core/src/services/dropbox/backend.rs b/core/src/services/dropbox/backend.rs index f025fe6b6..f826a87d1 100644 --- a/core/src/services/dropbox/backend.rs +++ b/core/src/services/dropbox/backend.rs @@ -22,7 +22,7 @@ use http::Response; use http::StatusCode; use super::core::*; -use super::delete::DropboxDeleter; +use super::deleter::DropboxDeleter; use super::error::*; use super::lister::DropboxLister; use super::writer::DropboxWriter; diff --git a/core/src/services/dropbox/delete.rs b/core/src/services/dropbox/deleter.rs similarity index 100% rename from core/src/services/dropbox/delete.rs rename to core/src/services/dropbox/deleter.rs diff --git a/core/src/services/dropbox/mod.rs b/core/src/services/dropbox/mod.rs index bd487630b..7efc88d97 100644 --- a/core/src/services/dropbox/mod.rs +++ b/core/src/services/dropbox/mod.rs @@ -16,16 +16,16 @@ // under the License. /// Default scheme for dropbox service. -pub(super) const DROPBOX_SCHEME: &str = "dropbox"; +pub const DROPBOX_SCHEME: &str = "dropbox"; + mod backend; +mod builder; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod builder; pub use builder::DropboxBuilder as Dropbox; - -mod config; pub use config::DropboxConfig; diff --git a/core/src/services/etcd/mod.rs b/core/src/services/etcd/mod.rs index b317d0626..cb0837db6 100644 --- a/core/src/services/etcd/mod.rs +++ b/core/src/services/etcd/mod.rs @@ -15,14 +15,16 @@ // specific language governing permissions and limitations // under the License. -pub(super) const ETCD_SCHEME: &str = "etcd"; +/// Default scheme for etcd service. +pub const ETCD_SCHEME: &str = "etcd"; + mod backend; +mod config; mod core; mod deleter; mod error; mod lister; mod writer; -pub use backend::EtcdBuilder as Etcd; -mod config; +pub use backend::EtcdBuilder as Etcd; pub use config::EtcdConfig; diff --git a/core/src/services/foundationdb/mod.rs b/core/src/services/foundationdb/mod.rs index c92ac58f0..111f15a1d 100644 --- a/core/src/services/foundationdb/mod.rs +++ b/core/src/services/foundationdb/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::FoundationdbBuilder as Foundationdb; - -mod config; pub use config::FoundationdbConfig; diff --git a/core/src/services/fs/backend.rs b/core/src/services/fs/backend.rs index b57ecf46e..8f6ddb417 100644 --- a/core/src/services/fs/backend.rs +++ b/core/src/services/fs/backend.rs @@ -23,7 +23,7 @@ use log::debug; use super::FS_SCHEME; use super::config::FsConfig; use super::core::*; -use super::delete::FsDeleter; +use super::deleter::FsDeleter; use super::lister::FsLister; use super::reader::FsReader; use super::writer::FsWriter; diff --git a/core/src/services/fs/delete.rs b/core/src/services/fs/deleter.rs similarity index 100% rename from core/src/services/fs/delete.rs rename to core/src/services/fs/deleter.rs diff --git a/core/src/services/fs/mod.rs b/core/src/services/fs/mod.rs index 107155822..b463d11df 100644 --- a/core/src/services/fs/mod.rs +++ b/core/src/services/fs/mod.rs @@ -17,15 +17,15 @@ /// Default scheme for fs service. pub const FS_SCHEME: &str = "fs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod reader; mod writer; -mod backend; pub use backend::FsBuilder as Fs; - -mod config; pub use config::FsConfig; diff --git a/core/src/services/ftp/backend.rs b/core/src/services/ftp/backend.rs index 75006da4c..af7700ec4 100644 --- a/core/src/services/ftp/backend.rs +++ b/core/src/services/ftp/backend.rs @@ -31,7 +31,7 @@ use tokio::sync::OnceCell; use super::FTP_SCHEME; use super::config::FtpConfig; use super::core::FtpCore; -use super::delete::FtpDeleter; +use super::deleter::FtpDeleter; use super::err::parse_error; use super::lister::FtpLister; use super::reader::FtpReader; diff --git a/core/src/services/ftp/delete.rs b/core/src/services/ftp/deleter.rs similarity index 100% rename from core/src/services/ftp/delete.rs rename to core/src/services/ftp/deleter.rs diff --git a/core/src/services/ftp/mod.rs b/core/src/services/ftp/mod.rs index 0e2a0d167..9d8047b0c 100644 --- a/core/src/services/ftp/mod.rs +++ b/core/src/services/ftp/mod.rs @@ -16,17 +16,16 @@ // under the License. /// Default scheme for ftp service. -pub(super) const FTP_SCHEME: &str = "ftp"; -mod delete; +pub const FTP_SCHEME: &str = "ftp"; + +mod backend; +mod config; +mod core; +mod deleter; mod err; mod lister; mod reader; mod writer; -mod backend; pub use backend::FtpBuilder as Ftp; -mod core; - -mod config; - pub use config::FtpConfig; diff --git a/core/src/services/gcs/backend.rs b/core/src/services/gcs/backend.rs index 667cebecb..eaec40781 100644 --- a/core/src/services/gcs/backend.rs +++ b/core/src/services/gcs/backend.rs @@ -29,7 +29,7 @@ use reqsign::GoogleTokenLoader; use super::GCS_SCHEME; use super::config::GcsConfig; use super::core::*; -use super::delete::GcsDeleter; +use super::deleter::GcsDeleter; use super::error::parse_error; use super::lister::GcsLister; use super::writer::GcsWriter; diff --git a/core/src/services/gcs/delete.rs b/core/src/services/gcs/deleter.rs similarity index 100% rename from core/src/services/gcs/delete.rs rename to core/src/services/gcs/deleter.rs diff --git a/core/src/services/gcs/mod.rs b/core/src/services/gcs/mod.rs index 3bf996c71..ccdf38253 100644 --- a/core/src/services/gcs/mod.rs +++ b/core/src/services/gcs/mod.rs @@ -17,15 +17,15 @@ /// Default scheme for gcs service. pub const GCS_SCHEME: &str = "gcs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod uri; mod writer; -mod backend; pub use backend::GcsBuilder as Gcs; - -mod config; pub use config::GcsConfig; diff --git a/core/src/services/gdrive/backend.rs b/core/src/services/gdrive/backend.rs index 3ac30f44a..185d22e23 100644 --- a/core/src/services/gdrive/backend.rs +++ b/core/src/services/gdrive/backend.rs @@ -24,7 +24,7 @@ use http::StatusCode; use super::core::GdriveCore; use super::core::GdriveFile; -use super::delete::GdriveDeleter; +use super::deleter::GdriveDeleter; use super::error::parse_error; use super::lister::GdriveLister; use super::writer::GdriveWriter; diff --git a/core/src/services/gdrive/delete.rs b/core/src/services/gdrive/deleter.rs similarity index 100% rename from core/src/services/gdrive/delete.rs rename to core/src/services/gdrive/deleter.rs diff --git a/core/src/services/gdrive/mod.rs b/core/src/services/gdrive/mod.rs index 3be25b77d..11d4cb609 100644 --- a/core/src/services/gdrive/mod.rs +++ b/core/src/services/gdrive/mod.rs @@ -16,16 +16,16 @@ // under the License. /// Default scheme for gdrive service. -pub(super) const GDRIVE_SCHEME: &str = "gdrive"; +pub const GDRIVE_SCHEME: &str = "gdrive"; + mod backend; +mod builder; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod builder; pub use builder::GdriveBuilder as Gdrive; - -mod config; pub use config::GdriveConfig; diff --git a/core/src/services/ghac/mod.rs b/core/src/services/ghac/mod.rs index 0b01d29b2..f7e65f313 100644 --- a/core/src/services/ghac/mod.rs +++ b/core/src/services/ghac/mod.rs @@ -16,14 +16,13 @@ // under the License. /// Default scheme for ghac service. -pub(super) const GHAC_SCHEME: &str = "ghac"; -mod error; -mod writer; +pub const GHAC_SCHEME: &str = "ghac"; mod backend; -pub use backend::GhacBuilder as Ghac; - +mod config; mod core; +mod error; +mod writer; -mod config; +pub use backend::GhacBuilder as Ghac; pub use config::GhacConfig; diff --git a/core/src/services/github/backend.rs b/core/src/services/github/backend.rs index cff70e2ed..1c14559b6 100644 --- a/core/src/services/github/backend.rs +++ b/core/src/services/github/backend.rs @@ -27,7 +27,7 @@ use super::GITHUB_SCHEME; use super::config::GithubConfig; use super::core::Entry; use super::core::GithubCore; -use super::delete::GithubDeleter; +use super::deleter::GithubDeleter; use super::error::parse_error; use super::lister::GithubLister; use super::writer::GithubWriter; diff --git a/core/src/services/github/delete.rs b/core/src/services/github/deleter.rs similarity index 100% rename from core/src/services/github/delete.rs rename to core/src/services/github/deleter.rs diff --git a/core/src/services/github/mod.rs b/core/src/services/github/mod.rs index 210675eef..4852744f0 100644 --- a/core/src/services/github/mod.rs +++ b/core/src/services/github/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for github service. -pub(super) const GITHUB_SCHEME: &str = "github"; +pub const GITHUB_SCHEME: &str = "github"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::GithubBuilder as Github; - -mod config; pub use config::GithubConfig; diff --git a/core/src/services/gridfs/mod.rs b/core/src/services/gridfs/mod.rs index 8458f5b6b..de112a176 100644 --- a/core/src/services/gridfs/mod.rs +++ b/core/src/services/gridfs/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::GridfsBuilder as Gridfs; - -mod config; pub use config::GridfsConfig; diff --git a/core/src/services/hdfs/backend.rs b/core/src/services/hdfs/backend.rs index 286cbce33..ef83b2c87 100644 --- a/core/src/services/hdfs/backend.rs +++ b/core/src/services/hdfs/backend.rs @@ -23,7 +23,7 @@ use log::debug; use super::HDFS_SCHEME; use super::config::HdfsConfig; use super::core::HdfsCore; -use super::delete::HdfsDeleter; +use super::deleter::HdfsDeleter; use super::lister::HdfsLister; use super::reader::HdfsReader; use super::writer::HdfsWriter; diff --git a/core/src/services/hdfs/delete.rs b/core/src/services/hdfs/deleter.rs similarity index 100% rename from core/src/services/hdfs/delete.rs rename to core/src/services/hdfs/deleter.rs diff --git a/core/src/services/hdfs/mod.rs b/core/src/services/hdfs/mod.rs index 9b35636f3..7b0f5fd85 100644 --- a/core/src/services/hdfs/mod.rs +++ b/core/src/services/hdfs/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for hdfs service. -pub(super) const HDFS_SCHEME: &str = "hdfs"; +pub const HDFS_SCHEME: &str = "hdfs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod lister; mod reader; mod writer; -mod backend; pub use backend::HdfsBuilder as Hdfs; - -mod config; pub use config::HdfsConfig; diff --git a/core/src/services/hdfs_native/backend.rs b/core/src/services/hdfs_native/backend.rs index 557567cf8..0788be0b6 100644 --- a/core/src/services/hdfs_native/backend.rs +++ b/core/src/services/hdfs_native/backend.rs @@ -22,7 +22,7 @@ use log::debug; use super::HDFS_NATIVE_SCHEME; use super::config::HdfsNativeConfig; use super::core::HdfsNativeCore; -use super::delete::HdfsNativeDeleter; +use super::deleter::HdfsNativeDeleter; use super::error::parse_hdfs_error; use super::lister::HdfsNativeLister; use super::reader::HdfsNativeReader; diff --git a/core/src/services/hdfs_native/delete.rs b/core/src/services/hdfs_native/deleter.rs similarity index 100% rename from core/src/services/hdfs_native/delete.rs rename to core/src/services/hdfs_native/deleter.rs diff --git a/core/src/services/hdfs_native/mod.rs b/core/src/services/hdfs_native/mod.rs index dfc3fe7b1..2cd190cc4 100644 --- a/core/src/services/hdfs_native/mod.rs +++ b/core/src/services/hdfs_native/mod.rs @@ -16,17 +16,16 @@ // under the License. /// Default scheme for hdfs_native service. -pub(super) const HDFS_NATIVE_SCHEME: &str = "hdfs_native"; +pub const HDFS_NATIVE_SCHEME: &str = "hdfs_native"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod reader; mod writer; -mod backend; pub use backend::HdfsNativeBuilder as HdfsNative; - -mod config; - pub use config::HdfsNativeConfig; diff --git a/core/src/services/http/mod.rs b/core/src/services/http/mod.rs index ace61580d..af2440287 100644 --- a/core/src/services/http/mod.rs +++ b/core/src/services/http/mod.rs @@ -16,12 +16,12 @@ // under the License. /// Default scheme for http service. -pub(super) const HTTP_SCHEME: &str = "http"; -mod error; +pub const HTTP_SCHEME: &str = "http"; mod backend; +mod config; mod core; -pub use backend::HttpBuilder as Http; +mod error; -mod config; +pub use backend::HttpBuilder as Http; pub use config::HttpConfig; diff --git a/core/src/services/huggingface/mod.rs b/core/src/services/huggingface/mod.rs index 63bb4423b..68b9d09a3 100644 --- a/core/src/services/huggingface/mod.rs +++ b/core/src/services/huggingface/mod.rs @@ -16,13 +16,13 @@ // under the License. /// Default scheme for huggingface service. -pub(super) const HUGGINGFACE_SCHEME: &str = "huggingface"; +pub const HUGGINGFACE_SCHEME: &str = "huggingface"; + +mod backend; +mod config; mod core; mod error; mod lister; -mod backend; pub use backend::HuggingfaceBuilder as Huggingface; - -mod config; pub use config::HuggingfaceConfig; diff --git a/core/src/services/ipfs/config.rs b/core/src/services/ipfs/config.rs index 85eac1c68..80d7cbdf2 100644 --- a/core/src/services/ipfs/config.rs +++ b/core/src/services/ipfs/config.rs @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::Debug; - use serde::Deserialize; use serde::Serialize; diff --git a/core/src/services/ipfs/mod.rs b/core/src/services/ipfs/mod.rs index 5cdce35b8..71c48b8bd 100644 --- a/core/src/services/ipfs/mod.rs +++ b/core/src/services/ipfs/mod.rs @@ -16,13 +16,13 @@ // under the License. /// Default scheme for ipfs service. -pub(super) const IPFS_SCHEME: &str = "ipfs"; -mod error; -mod ipld; +pub const IPFS_SCHEME: &str = "ipfs"; mod backend; -pub use backend::IpfsBuilder as Ipfs; +mod config; mod core; +mod error; +mod ipld; -mod config; +pub use backend::IpfsBuilder as Ipfs; pub use config::IpfsConfig; diff --git a/core/src/services/ipmfs/backend.rs b/core/src/services/ipmfs/backend.rs index 0a83924a7..c10550355 100644 --- a/core/src/services/ipmfs/backend.rs +++ b/core/src/services/ipmfs/backend.rs @@ -23,7 +23,7 @@ use http::StatusCode; use serde::Deserialize; use super::core::IpmfsCore; -use super::delete::IpmfsDeleter; +use super::deleter::IpmfsDeleter; use super::error::parse_error; use super::lister::IpmfsLister; use super::writer::IpmfsWriter; diff --git a/core/src/services/ipmfs/delete.rs b/core/src/services/ipmfs/deleter.rs similarity index 100% rename from core/src/services/ipmfs/delete.rs rename to core/src/services/ipmfs/deleter.rs diff --git a/core/src/services/ipmfs/mod.rs b/core/src/services/ipmfs/mod.rs index 0ef6ce78a..b1ae29161 100644 --- a/core/src/services/ipmfs/mod.rs +++ b/core/src/services/ipmfs/mod.rs @@ -16,16 +16,16 @@ // under the License. /// Default scheme for ipmfs service. -pub(super) const IPMFS_SCHEME: &str = "ipmfs"; +pub const IPMFS_SCHEME: &str = "ipmfs"; + mod backend; +mod builder; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod builder; pub use builder::IpmfsBuilder as Ipmfs; - -mod config; pub use config::IpmfsConfig; diff --git a/core/src/services/koofr/backend.rs b/core/src/services/koofr/backend.rs index b0eca1647..6a05b62df 100644 --- a/core/src/services/koofr/backend.rs +++ b/core/src/services/koofr/backend.rs @@ -30,7 +30,7 @@ use super::config::KoofrConfig; use super::core::File; use super::core::KoofrCore; use super::core::KoofrSigner; -use super::delete::KoofrDeleter; +use super::deleter::KoofrDeleter; use super::error::parse_error; use super::lister::KoofrLister; use super::writer::KoofrWriter; diff --git a/core/src/services/koofr/delete.rs b/core/src/services/koofr/deleter.rs similarity index 100% rename from core/src/services/koofr/delete.rs rename to core/src/services/koofr/deleter.rs diff --git a/core/src/services/koofr/mod.rs b/core/src/services/koofr/mod.rs index 228ffb0e6..eabacd782 100644 --- a/core/src/services/koofr/mod.rs +++ b/core/src/services/koofr/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for koofr service. -pub(super) const KOOFR_SCHEME: &str = "koofr"; +pub const KOOFR_SCHEME: &str = "koofr"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::KoofrBuilder as Koofr; - -mod config; pub use config::KoofrConfig; diff --git a/core/src/services/lakefs/backend.rs b/core/src/services/lakefs/backend.rs index 3518cd760..0548b98fb 100644 --- a/core/src/services/lakefs/backend.rs +++ b/core/src/services/lakefs/backend.rs @@ -26,7 +26,7 @@ use super::LAKEFS_SCHEME; use super::config::LakefsConfig; use super::core::LakefsCore; use super::core::LakefsStatus; -use super::delete::LakefsDeleter; +use super::deleter::LakefsDeleter; use super::error::parse_error; use super::lister::LakefsLister; use super::writer::LakefsWriter; diff --git a/core/src/services/lakefs/delete.rs b/core/src/services/lakefs/deleter.rs similarity index 100% rename from core/src/services/lakefs/delete.rs rename to core/src/services/lakefs/deleter.rs diff --git a/core/src/services/lakefs/mod.rs b/core/src/services/lakefs/mod.rs index d448a409d..e4cef817c 100644 --- a/core/src/services/lakefs/mod.rs +++ b/core/src/services/lakefs/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for lakefs service. -pub(super) const LAKEFS_SCHEME: &str = "lakefs"; +pub const LAKEFS_SCHEME: &str = "lakefs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::LakefsBuilder as Lakefs; - -mod config; pub use config::LakefsConfig; diff --git a/core/src/services/memcached/mod.rs b/core/src/services/memcached/mod.rs index bd29318fb..7d6a66b1e 100644 --- a/core/src/services/memcached/mod.rs +++ b/core/src/services/memcached/mod.rs @@ -17,11 +17,10 @@ mod backend; mod binary; +mod config; mod core; mod deleter; mod writer; pub use backend::MemcachedBuilder as Memcached; - -mod config; pub use config::MemcachedConfig; diff --git a/core/src/services/memory/backend.rs b/core/src/services/memory/backend.rs index f6a0c717d..cfffd1208 100644 --- a/core/src/services/memory/backend.rs +++ b/core/src/services/memory/backend.rs @@ -21,7 +21,7 @@ use std::sync::Arc; use super::MEMORY_SCHEME; use super::config::MemoryConfig; use super::core::*; -use super::delete::MemoryDeleter; +use super::deleter::MemoryDeleter; use super::lister::MemoryLister; use super::writer::MemoryWriter; use crate::raw::oio; diff --git a/core/src/services/memory/config.rs b/core/src/services/memory/config.rs index 619ca9a41..f22e422d9 100644 --- a/core/src/services/memory/config.rs +++ b/core/src/services/memory/config.rs @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::Debug; - use serde::Deserialize; use serde::Serialize; diff --git a/core/src/services/memory/delete.rs b/core/src/services/memory/deleter.rs similarity index 100% rename from core/src/services/memory/delete.rs rename to core/src/services/memory/deleter.rs diff --git a/core/src/services/memory/mod.rs b/core/src/services/memory/mod.rs index ba786dc27..71af2d39d 100644 --- a/core/src/services/memory/mod.rs +++ b/core/src/services/memory/mod.rs @@ -17,13 +17,13 @@ /// Default scheme for memory service. pub const MEMORY_SCHEME: &str = "memory"; -mod backend; -pub use backend::MemoryBuilder as Memory; +mod backend; mod config; -pub use config::MemoryConfig; - mod core; -mod delete; +mod deleter; mod lister; mod writer; + +pub use backend::MemoryBuilder as Memory; +pub use config::MemoryConfig; diff --git a/core/src/services/mini_moka/backend.rs b/core/src/services/mini_moka/backend.rs index 8fd5a92e2..24a6b08ed 100644 --- a/core/src/services/mini_moka/backend.rs +++ b/core/src/services/mini_moka/backend.rs @@ -23,7 +23,7 @@ use log::debug; use super::MINI_MOKA_SCHEME; use super::config::MiniMokaConfig; use super::core::*; -use super::delete::MiniMokaDeleter; +use super::deleter::MiniMokaDeleter; use super::lister::MiniMokaLister; use super::writer::MiniMokaWriter; use crate::raw::*; diff --git a/core/src/services/mini_moka/delete.rs b/core/src/services/mini_moka/deleter.rs similarity index 100% rename from core/src/services/mini_moka/delete.rs rename to core/src/services/mini_moka/deleter.rs diff --git a/core/src/services/mini_moka/mod.rs b/core/src/services/mini_moka/mod.rs index f565a2791..24514ef08 100644 --- a/core/src/services/mini_moka/mod.rs +++ b/core/src/services/mini_moka/mod.rs @@ -16,14 +16,14 @@ // under the License. /// Default scheme for mini_moka service. -pub(super) const MINI_MOKA_SCHEME: &str = "mini-moka"; +pub const MINI_MOKA_SCHEME: &str = "mini-moka"; + mod backend; +mod config; mod core; -mod delete; +mod deleter; mod lister; mod writer; pub use backend::MiniMokaBuilder as MiniMoka; - -mod config; pub use config::MiniMokaConfig; diff --git a/core/src/services/moka/backend.rs b/core/src/services/moka/backend.rs index c880ddda7..dd83b029e 100644 --- a/core/src/services/moka/backend.rs +++ b/core/src/services/moka/backend.rs @@ -24,7 +24,7 @@ use log::debug; use super::MOKA_SCHEME; use super::config::MokaConfig; use super::core::*; -use super::delete::MokaDeleter; +use super::deleter::MokaDeleter; use super::lister::MokaLister; use super::writer::MokaWriter; use crate::raw::oio; diff --git a/core/src/services/moka/delete.rs b/core/src/services/moka/deleter.rs similarity index 100% rename from core/src/services/moka/delete.rs rename to core/src/services/moka/deleter.rs diff --git a/core/src/services/moka/mod.rs b/core/src/services/moka/mod.rs index c4c39172a..ea5bfc216 100644 --- a/core/src/services/moka/mod.rs +++ b/core/src/services/moka/mod.rs @@ -16,17 +16,16 @@ // under the License. /// Default scheme for moka service. -pub(super) const MOKA_SCHEME: &str = "moka"; +pub const MOKA_SCHEME: &str = "moka"; + mod backend; +mod config; mod core; -mod delete; +mod deleter; mod lister; mod writer; pub use backend::MokaBuilder as Moka; pub use backend::MokaCacheBuilder; - -pub use core::MokaValue; - -mod config; pub use config::MokaConfig; +pub use core::MokaValue; diff --git a/core/src/services/mongodb/mod.rs b/core/src/services/mongodb/mod.rs index 539ff378b..cd9deb0de 100644 --- a/core/src/services/mongodb/mod.rs +++ b/core/src/services/mongodb/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::MongodbBuilder as Mongodb; - -mod config; pub use config::MongodbConfig; diff --git a/core/src/services/monoiofs/backend.rs b/core/src/services/monoiofs/backend.rs index 33268cc63..67bfaf75d 100644 --- a/core/src/services/monoiofs/backend.rs +++ b/core/src/services/monoiofs/backend.rs @@ -25,7 +25,7 @@ use monoio::fs::OpenOptions; use super::config::MonoiofsConfig; use super::core::BUFFER_SIZE; use super::core::MonoiofsCore; -use super::delete::MonoiofsDeleter; +use super::deleter::MonoiofsDeleter; use super::reader::MonoiofsReader; use super::writer::MonoiofsWriter; use crate::raw::*; diff --git a/core/src/services/monoiofs/delete.rs b/core/src/services/monoiofs/deleter.rs similarity index 100% rename from core/src/services/monoiofs/delete.rs rename to core/src/services/monoiofs/deleter.rs diff --git a/core/src/services/monoiofs/mod.rs b/core/src/services/monoiofs/mod.rs index a2849437c..2beaae63d 100644 --- a/core/src/services/monoiofs/mod.rs +++ b/core/src/services/monoiofs/mod.rs @@ -16,14 +16,14 @@ // under the License. /// Default scheme for monoiofs service. -pub(super) const MONOIOFS_SCHEME: &str = "monoiofs"; +pub const MONOIOFS_SCHEME: &str = "monoiofs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod reader; mod writer; -mod backend; pub use backend::MonoiofsBuilder as Monoiofs; - -mod config; pub use config::MonoiofsConfig; diff --git a/core/src/services/mysql/mod.rs b/core/src/services/mysql/mod.rs index 578b906da..8d84f7364 100644 --- a/core/src/services/mysql/mod.rs +++ b/core/src/services/mysql/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::MysqlBuilder as Mysql; - -mod config; pub use config::MysqlConfig; diff --git a/core/src/services/obs/backend.rs b/core/src/services/obs/backend.rs index c9c2b225e..d8d403911 100644 --- a/core/src/services/obs/backend.rs +++ b/core/src/services/obs/backend.rs @@ -31,7 +31,7 @@ use super::OBS_SCHEME; use super::config::ObsConfig; use super::core::ObsCore; use super::core::constants; -use super::delete::ObsDeleter; +use super::deleter::ObsDeleter; use super::error::parse_error; use super::lister::ObsLister; use super::writer::ObsWriter; diff --git a/core/src/services/obs/delete.rs b/core/src/services/obs/deleter.rs similarity index 100% rename from core/src/services/obs/delete.rs rename to core/src/services/obs/deleter.rs diff --git a/core/src/services/obs/mod.rs b/core/src/services/obs/mod.rs index ee2e0f183..417ef04ae 100644 --- a/core/src/services/obs/mod.rs +++ b/core/src/services/obs/mod.rs @@ -17,14 +17,14 @@ /// Default scheme for obs service. pub const OBS_SCHEME: &str = "obs"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::ObsBuilder as Obs; - -mod config; pub use config::ObsConfig; diff --git a/core/src/services/onedrive/backend.rs b/core/src/services/onedrive/backend.rs index b55311087..c6856ddf6 100644 --- a/core/src/services/onedrive/backend.rs +++ b/core/src/services/onedrive/backend.rs @@ -21,7 +21,7 @@ use http::Response; use http::StatusCode; use super::core::OneDriveCore; -use super::delete::OneDriveDeleter; +use super::deleter::OneDriveDeleter; use super::error::parse_error; use super::lister::OneDriveLister; use super::writer::OneDriveWriter; diff --git a/core/src/services/onedrive/delete.rs b/core/src/services/onedrive/deleter.rs similarity index 100% rename from core/src/services/onedrive/delete.rs rename to core/src/services/onedrive/deleter.rs diff --git a/core/src/services/onedrive/mod.rs b/core/src/services/onedrive/mod.rs index fa140b345..5f78a0d78 100644 --- a/core/src/services/onedrive/mod.rs +++ b/core/src/services/onedrive/mod.rs @@ -16,17 +16,17 @@ // under the License. /// Default scheme for onedrive service. -pub(super) const ONEDRIVE_SCHEME: &str = "onedrive"; +pub const ONEDRIVE_SCHEME: &str = "onedrive"; + mod backend; +mod builder; +mod config; mod core; -mod delete; +mod deleter; mod error; mod graph_model; mod lister; mod writer; -mod builder; pub use builder::OnedriveBuilder as Onedrive; - -mod config; pub use config::OnedriveConfig; diff --git a/core/src/services/opfs/mod.rs b/core/src/services/opfs/mod.rs index cbe59ee9e..ae67a32e5 100644 --- a/core/src/services/opfs/mod.rs +++ b/core/src/services/opfs/mod.rs @@ -16,10 +16,7 @@ // under the License. mod backend; -mod core; - mod config; - +mod core; mod error; - mod utils; diff --git a/core/src/services/oss/backend.rs b/core/src/services/oss/backend.rs index 622c85c05..f8fa20466 100644 --- a/core/src/services/oss/backend.rs +++ b/core/src/services/oss/backend.rs @@ -29,7 +29,7 @@ use reqsign::AliyunOssSigner; use super::OSS_SCHEME; use super::config::OssConfig; use super::core::*; -use super::delete::OssDeleter; +use super::deleter::OssDeleter; use super::error::parse_error; use super::lister::OssLister; use super::lister::OssListers; diff --git a/core/src/services/oss/delete.rs b/core/src/services/oss/deleter.rs similarity index 100% rename from core/src/services/oss/delete.rs rename to core/src/services/oss/deleter.rs diff --git a/core/src/services/oss/mod.rs b/core/src/services/oss/mod.rs index f39bdf37e..62d233c1e 100644 --- a/core/src/services/oss/mod.rs +++ b/core/src/services/oss/mod.rs @@ -17,14 +17,14 @@ /// Default scheme for oss service. pub const OSS_SCHEME: &str = "oss"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::OssBuilder as Oss; - -mod config; pub use config::OssConfig; diff --git a/core/src/services/pcloud/backend.rs b/core/src/services/pcloud/backend.rs index 7a4a9a8ea..e99f3e38f 100644 --- a/core/src/services/pcloud/backend.rs +++ b/core/src/services/pcloud/backend.rs @@ -26,7 +26,7 @@ use log::debug; use super::PCLOUD_SCHEME; use super::config::PcloudConfig; use super::core::*; -use super::delete::PcloudDeleter; +use super::deleter::PcloudDeleter; use super::error::PcloudError; use super::error::parse_error; use super::lister::PcloudLister; diff --git a/core/src/services/pcloud/delete.rs b/core/src/services/pcloud/deleter.rs similarity index 100% rename from core/src/services/pcloud/delete.rs rename to core/src/services/pcloud/deleter.rs diff --git a/core/src/services/pcloud/mod.rs b/core/src/services/pcloud/mod.rs index 715a7f393..e01002900 100644 --- a/core/src/services/pcloud/mod.rs +++ b/core/src/services/pcloud/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for pcloud service. -pub(super) const PCLOUD_SCHEME: &str = "pcloud"; +pub const PCLOUD_SCHEME: &str = "pcloud"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::PcloudBuilder as Pcloud; - -mod config; pub use config::PcloudConfig; diff --git a/core/src/services/persy/mod.rs b/core/src/services/persy/mod.rs index 8dc68c854..16f7a8391 100644 --- a/core/src/services/persy/mod.rs +++ b/core/src/services/persy/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::PersyBuilder as Persy; - -mod config; pub use config::PersyConfig; diff --git a/core/src/services/postgresql/mod.rs b/core/src/services/postgresql/mod.rs index 525e607fc..9c07b44d7 100644 --- a/core/src/services/postgresql/mod.rs +++ b/core/src/services/postgresql/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::PostgresqlBuilder as Postgresql; - -mod config; pub use config::PostgresqlConfig; diff --git a/core/src/services/redb/config.rs b/core/src/services/redb/config.rs index 45a81a2cf..8082a6231 100644 --- a/core/src/services/redb/config.rs +++ b/core/src/services/redb/config.rs @@ -15,8 +15,6 @@ // specific language governing permissions and limitations // under the License. -use std::fmt::Debug; - use serde::Deserialize; use serde::Serialize; diff --git a/core/src/services/redb/mod.rs b/core/src/services/redb/mod.rs index 43a87539d..fcbe81d4c 100644 --- a/core/src/services/redb/mod.rs +++ b/core/src/services/redb/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::RedbBuilder as Redb; - -mod config; pub use config::RedbConfig; diff --git a/core/src/services/redis/mod.rs b/core/src/services/redis/mod.rs index 4ddb2c545..d0610f508 100644 --- a/core/src/services/redis/mod.rs +++ b/core/src/services/redis/mod.rs @@ -16,13 +16,13 @@ // under the License. /// Default scheme for redis service. -pub(super) const REDIS_SCHEME: &str = "redis"; +pub const REDIS_SCHEME: &str = "redis"; + mod backend; +mod config; mod core; mod delete; mod writer; pub use backend::RedisBuilder as Redis; - -mod config; pub use config::RedisConfig; diff --git a/core/src/services/rocksdb/mod.rs b/core/src/services/rocksdb/mod.rs index 48c733f1c..4ced1503d 100644 --- a/core/src/services/rocksdb/mod.rs +++ b/core/src/services/rocksdb/mod.rs @@ -16,12 +16,11 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod lister; mod writer; pub use backend::RocksdbBuilder as Rocksdb; - -mod config; pub use config::RocksdbConfig; diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs index 0890f9573..49db0ef95 100644 --- a/core/src/services/s3/backend.rs +++ b/core/src/services/s3/backend.rs @@ -43,7 +43,7 @@ use reqwest::Url; use super::S3_SCHEME; use super::config::S3Config; use super::core::*; -use super::delete::S3Deleter; +use super::deleter::S3Deleter; use super::error::parse_error; use super::lister::S3ListerV1; use super::lister::S3ListerV2; diff --git a/core/src/services/s3/delete.rs b/core/src/services/s3/deleter.rs similarity index 100% rename from core/src/services/s3/delete.rs rename to core/src/services/s3/deleter.rs diff --git a/core/src/services/s3/mod.rs b/core/src/services/s3/mod.rs index a0052ac1b..5c8bb617b 100644 --- a/core/src/services/s3/mod.rs +++ b/core/src/services/s3/mod.rs @@ -17,14 +17,14 @@ /// Default scheme for s3 service. pub const S3_SCHEME: &str = "s3"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::S3Builder as S3; - -mod config; pub use config::S3Config; diff --git a/core/src/services/seafile/backend.rs b/core/src/services/seafile/backend.rs index ffd474432..5ac121e03 100644 --- a/core/src/services/seafile/backend.rs +++ b/core/src/services/seafile/backend.rs @@ -29,7 +29,7 @@ use super::core::SeafileCore; use super::core::SeafileSigner; use super::core::parse_dir_detail; use super::core::parse_file_detail; -use super::delete::SeafileDeleter; +use super::deleter::SeafileDeleter; use super::error::parse_error; use super::lister::SeafileLister; use super::writer::SeafileWriter; diff --git a/core/src/services/seafile/delete.rs b/core/src/services/seafile/deleter.rs similarity index 100% rename from core/src/services/seafile/delete.rs rename to core/src/services/seafile/deleter.rs diff --git a/core/src/services/seafile/mod.rs b/core/src/services/seafile/mod.rs index 12abb6686..d658fff41 100644 --- a/core/src/services/seafile/mod.rs +++ b/core/src/services/seafile/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for seafile service. -pub(super) const SEAFILE_SCHEME: &str = "seafile"; +pub const SEAFILE_SCHEME: &str = "seafile"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::SeafileBuilder as Seafile; - -mod config; pub use config::SeafileConfig; diff --git a/core/src/services/sftp/backend.rs b/core/src/services/sftp/backend.rs index 46d60910e..b5758c470 100644 --- a/core/src/services/sftp/backend.rs +++ b/core/src/services/sftp/backend.rs @@ -28,7 +28,7 @@ use tokio::sync::OnceCell; use super::SFTP_SCHEME; use super::config::SftpConfig; use super::core::SftpCore; -use super::delete::SftpDeleter; +use super::deleter::SftpDeleter; use super::error::is_not_found; use super::error::is_sftp_protocol_error; use super::error::parse_sftp_error; diff --git a/core/src/services/sftp/delete.rs b/core/src/services/sftp/deleter.rs similarity index 100% rename from core/src/services/sftp/delete.rs rename to core/src/services/sftp/deleter.rs diff --git a/core/src/services/sftp/mod.rs b/core/src/services/sftp/mod.rs index fa31d4a6f..cb608983d 100644 --- a/core/src/services/sftp/mod.rs +++ b/core/src/services/sftp/mod.rs @@ -16,17 +16,17 @@ // under the License. /// Default scheme for sftp service. -pub(super) const SFTP_SCHEME: &str = "sftp"; -mod delete; +pub const SFTP_SCHEME: &str = "sftp"; + +mod backend; +mod config; +mod core; +mod deleter; mod error; mod lister; mod reader; mod utils; mod writer; -mod backend; pub use backend::SftpBuilder as Sftp; -mod core; - -mod config; pub use config::SftpConfig; diff --git a/core/src/services/sled/mod.rs b/core/src/services/sled/mod.rs index b40c3ff15..2c55a24f1 100644 --- a/core/src/services/sled/mod.rs +++ b/core/src/services/sled/mod.rs @@ -16,12 +16,11 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod lister; mod writer; pub use backend::SledBuilder as Sled; - -mod config; pub use config::SledConfig; diff --git a/core/src/services/sqlite/backend.rs b/core/src/services/sqlite/backend.rs index 51eb44f36..34b13f370 100644 --- a/core/src/services/sqlite/backend.rs +++ b/core/src/services/sqlite/backend.rs @@ -23,7 +23,7 @@ use tokio::sync::OnceCell; use super::config::SqliteConfig; use super::core::SqliteCore; -use super::delete::SqliteDeleter; +use super::deleter::SqliteDeleter; use super::writer::SqliteWriter; use crate::raw::oio; use crate::raw::*; diff --git a/core/src/services/sqlite/delete.rs b/core/src/services/sqlite/deleter.rs similarity index 100% rename from core/src/services/sqlite/delete.rs rename to core/src/services/sqlite/deleter.rs diff --git a/core/src/services/sqlite/mod.rs b/core/src/services/sqlite/mod.rs index 28f0355fc..d2af2e5fc 100644 --- a/core/src/services/sqlite/mod.rs +++ b/core/src/services/sqlite/mod.rs @@ -16,14 +16,10 @@ // under the License. mod backend; -pub use backend::SqliteBuilder as Sqlite; - mod config; -pub use config::SqliteConfig; - -#[cfg(feature = "services-sqlite")] mod core; -#[cfg(feature = "services-sqlite")] -mod delete; -#[cfg(feature = "services-sqlite")] +mod deleter; mod writer; + +pub use backend::SqliteBuilder as Sqlite; +pub use config::SqliteConfig; diff --git a/core/src/services/surrealdb/mod.rs b/core/src/services/surrealdb/mod.rs index c54f14740..fc0180491 100644 --- a/core/src/services/surrealdb/mod.rs +++ b/core/src/services/surrealdb/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::SurrealdbBuilder as Surrealdb; - -mod config; pub use config::SurrealdbConfig; diff --git a/core/src/services/swift/backend.rs b/core/src/services/swift/backend.rs index 0cc6a6718..35cb829fe 100644 --- a/core/src/services/swift/backend.rs +++ b/core/src/services/swift/backend.rs @@ -24,7 +24,7 @@ use log::debug; use super::SWIFT_SCHEME; use super::core::*; -use super::delete::SwfitDeleter; +use super::deleter::SwfitDeleter; use super::error::parse_error; use super::lister::SwiftLister; use super::writer::SwiftWriter; diff --git a/core/src/services/swift/delete.rs b/core/src/services/swift/deleter.rs similarity index 100% rename from core/src/services/swift/delete.rs rename to core/src/services/swift/deleter.rs diff --git a/core/src/services/swift/mod.rs b/core/src/services/swift/mod.rs index 8f3b8c8b9..4eff77934 100644 --- a/core/src/services/swift/mod.rs +++ b/core/src/services/swift/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for swift service. -pub(super) const SWIFT_SCHEME: &str = "swift"; +pub const SWIFT_SCHEME: &str = "swift"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::SwiftBuilder as Swift; - -mod config; pub use config::SwiftConfig; diff --git a/core/src/services/tikv/mod.rs b/core/src/services/tikv/mod.rs index 8844a85d1..49249a9a7 100644 --- a/core/src/services/tikv/mod.rs +++ b/core/src/services/tikv/mod.rs @@ -16,11 +16,10 @@ // under the License. mod backend; +mod config; mod core; mod deleter; mod writer; pub use backend::TikvBuilder as Tikv; - -mod config; pub use config::TikvConfig; diff --git a/core/src/services/upyun/backend.rs b/core/src/services/upyun/backend.rs index 5da6355d1..7fde58802 100644 --- a/core/src/services/upyun/backend.rs +++ b/core/src/services/upyun/backend.rs @@ -25,7 +25,7 @@ use log::debug; use super::UPYUN_SCHEME; use super::config::UpyunConfig; use super::core::*; -use super::delete::UpyunDeleter; +use super::deleter::UpyunDeleter; use super::error::parse_error; use super::lister::UpyunLister; use super::writer::UpyunWriter; diff --git a/core/src/services/upyun/delete.rs b/core/src/services/upyun/deleter.rs similarity index 100% rename from core/src/services/upyun/delete.rs rename to core/src/services/upyun/deleter.rs diff --git a/core/src/services/upyun/mod.rs b/core/src/services/upyun/mod.rs index 98835b5b3..9f65e9405 100644 --- a/core/src/services/upyun/mod.rs +++ b/core/src/services/upyun/mod.rs @@ -17,14 +17,14 @@ /// Default scheme for upyun service. pub const UPYUN_SCHEME: &str = "upyun"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::UpyunBuilder as Upyun; - -mod config; pub use config::UpyunConfig; diff --git a/core/src/services/vercel_artifacts/mod.rs b/core/src/services/vercel_artifacts/mod.rs index 2c972e82a..3fd31a39d 100644 --- a/core/src/services/vercel_artifacts/mod.rs +++ b/core/src/services/vercel_artifacts/mod.rs @@ -16,14 +16,14 @@ // under the License. /// Default scheme for vercel_artifacts service. -pub(super) const VERCEL_ARTIFACTS_SCHEME: &str = "vercel-artifacts"; +pub const VERCEL_ARTIFACTS_SCHEME: &str = "vercel-artifacts"; + mod backend; +mod builder; +mod config; mod core; mod error; mod writer; -mod builder; pub use builder::VercelArtifactsBuilder as VercelArtifacts; - -mod config; pub use config::VercelArtifactsConfig; diff --git a/core/src/services/vercel_blob/backend.rs b/core/src/services/vercel_blob/backend.rs index 558b89211..8126e6dbe 100644 --- a/core/src/services/vercel_blob/backend.rs +++ b/core/src/services/vercel_blob/backend.rs @@ -27,7 +27,7 @@ use super::VERCEL_BLOB_SCHEME; use super::core::Blob; use super::core::VercelBlobCore; use super::core::parse_blob; -use super::delete::VercelBlobDeleter; +use super::deleter::VercelBlobDeleter; use super::error::parse_error; use super::lister::VercelBlobLister; use super::writer::VercelBlobWriter; diff --git a/core/src/services/vercel_blob/delete.rs b/core/src/services/vercel_blob/deleter.rs similarity index 100% rename from core/src/services/vercel_blob/delete.rs rename to core/src/services/vercel_blob/deleter.rs diff --git a/core/src/services/vercel_blob/mod.rs b/core/src/services/vercel_blob/mod.rs index 74aed19ad..bccfc05cc 100644 --- a/core/src/services/vercel_blob/mod.rs +++ b/core/src/services/vercel_blob/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for vercel_blob service. -pub(super) const VERCEL_BLOB_SCHEME: &str = "vercel-blob"; +pub const VERCEL_BLOB_SCHEME: &str = "vercel-blob"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::VercelBlobBuilder as VercelBlob; - -mod config; pub use config::VercelBlobConfig; diff --git a/core/src/services/webdav/backend.rs b/core/src/services/webdav/backend.rs index e28ac8671..813027a10 100644 --- a/core/src/services/webdav/backend.rs +++ b/core/src/services/webdav/backend.rs @@ -26,7 +26,7 @@ use log::debug; use super::WEBDAV_SCHEME; use super::config::WebdavConfig; use super::core::*; -use super::delete::WebdavDeleter; +use super::deleter::WebdavDeleter; use super::error::parse_error; use super::lister::WebdavLister; use super::writer::WebdavWriter; diff --git a/core/src/services/webdav/delete.rs b/core/src/services/webdav/deleter.rs similarity index 100% rename from core/src/services/webdav/delete.rs rename to core/src/services/webdav/deleter.rs diff --git a/core/src/services/webdav/mod.rs b/core/src/services/webdav/mod.rs index bd2c4406a..7e46b570c 100644 --- a/core/src/services/webdav/mod.rs +++ b/core/src/services/webdav/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for webdav service. -pub(super) const WEBDAV_SCHEME: &str = "webdav"; +pub const WEBDAV_SCHEME: &str = "webdav"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::WebdavBuilder as Webdav; - -mod config; pub use config::WebdavConfig; diff --git a/core/src/services/webhdfs/backend.rs b/core/src/services/webhdfs/backend.rs index 2c9ca7c8d..8913d0666 100644 --- a/core/src/services/webhdfs/backend.rs +++ b/core/src/services/webhdfs/backend.rs @@ -27,7 +27,7 @@ use tokio::sync::OnceCell; use super::WEBHDFS_SCHEME; use super::config::WebhdfsConfig; use super::core::WebhdfsCore; -use super::delete::WebhdfsDeleter; +use super::deleter::WebhdfsDeleter; use super::error::parse_error; use super::lister::WebhdfsLister; use super::message::BooleanResp; diff --git a/core/src/services/webhdfs/delete.rs b/core/src/services/webhdfs/deleter.rs similarity index 100% rename from core/src/services/webhdfs/delete.rs rename to core/src/services/webhdfs/deleter.rs diff --git a/core/src/services/webhdfs/mod.rs b/core/src/services/webhdfs/mod.rs index 672806433..7e9c47125 100644 --- a/core/src/services/webhdfs/mod.rs +++ b/core/src/services/webhdfs/mod.rs @@ -16,17 +16,16 @@ // under the License. /// Default scheme for webhdfs service. -pub(super) const WEBHDFS_SCHEME: &str = "webhdfs"; -mod delete; +pub const WEBHDFS_SCHEME: &str = "webhdfs"; + +mod backend; +mod config; +mod core; +mod deleter; mod error; mod lister; mod message; mod writer; -mod backend; pub use backend::WebhdfsBuilder as Webhdfs; - -mod core; - -mod config; pub use config::WebhdfsConfig; diff --git a/core/src/services/yandex_disk/backend.rs b/core/src/services/yandex_disk/backend.rs index 41c684780..1dbb03dba 100644 --- a/core/src/services/yandex_disk/backend.rs +++ b/core/src/services/yandex_disk/backend.rs @@ -26,7 +26,7 @@ use log::debug; use super::YANDEX_DISK_SCHEME; use super::config::YandexDiskConfig; use super::core::*; -use super::delete::YandexDiskDeleter; +use super::deleter::YandexDiskDeleter; use super::error::parse_error; use super::lister::YandexDiskLister; use super::writer::YandexDiskWriter; diff --git a/core/src/services/yandex_disk/delete.rs b/core/src/services/yandex_disk/deleter.rs similarity index 100% rename from core/src/services/yandex_disk/delete.rs rename to core/src/services/yandex_disk/deleter.rs diff --git a/core/src/services/yandex_disk/mod.rs b/core/src/services/yandex_disk/mod.rs index 7945059e5..616273d11 100644 --- a/core/src/services/yandex_disk/mod.rs +++ b/core/src/services/yandex_disk/mod.rs @@ -16,15 +16,15 @@ // under the License. /// Default scheme for yandex_disk service. -pub(super) const YANDEX_DISK_SCHEME: &str = "yandex-disk"; +pub const YANDEX_DISK_SCHEME: &str = "yandex-disk"; + +mod backend; +mod config; mod core; -mod delete; +mod deleter; mod error; mod lister; mod writer; -mod backend; pub use backend::YandexDiskBuilder as YandexDisk; - -mod config; pub use config::YandexDiskConfig;
