You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by ti...@apache.org on 2024/07/20 00:37:20 UTC
(opendal) 07/10: fixup
This is an automated email from the ASF dual-hosted git repository.
tison pushed a commit to branch make-config-data-object
in repository https://gitbox.apache.org/repos/asf/opendal.git
commit 875fed8d3c9fac90c971764af55127efa7b48a2e
Author: tison <wa...@gmail.com>
AuthorDate: Fri Jul 19 17:21:55 2024 -0700
fixup
Signed-off-by: tison <wa...@gmail.com>
---
core/src/services/compfs/backend.rs | 12 ++++++------
core/src/services/dbfs/mod.rs | 2 +-
core/src/services/github/backend.rs | 16 ----------------
core/src/services/mini_moka/backend.rs | 8 +++-----
core/src/services/mod.rs | 16 ++++++++--------
core/src/services/obs/backend.rs | 2 +-
core/src/services/persy/backend.rs | 2 +-
core/src/services/vercel_artifacts/builder.rs | 2 +-
core/src/services/vercel_blob/backend.rs | 5 ++++-
9 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/core/src/services/compfs/backend.rs b/core/src/services/compfs/backend.rs
index 68dc91617e..2396f3d01a 100644
--- a/core/src/services/compfs/backend.rs
+++ b/core/src/services/compfs/backend.rs
@@ -15,15 +15,15 @@
// specific language governing permissions and limitations
// under the License.
-use compio::{dispatcher::Dispatcher, fs::OpenOptions};
+use std::{io::Cursor, sync::Arc};
-use super::{core::CompfsCore, lister::CompfsLister, reader::CompfsReader, writer::CompfsWriter};
+use compio::{dispatcher::Dispatcher, fs::OpenOptions};
+use serde::{Deserialize, Serialize};
use crate::raw::*;
use crate::*;
-use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, io::Cursor, sync::Arc};
+use super::{core::CompfsCore, lister::CompfsLister, reader::CompfsReader, writer::CompfsWriter};
/// compio-based file system support.
#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -77,7 +77,7 @@ impl Builder for CompfsBuilder {
std::fs::create_dir_all(&root).map_err(|e| {
Error::new(ErrorKind::Unexpected, "create root dir failed")
.with_operation("Builder::build")
- .with_context("root", root.to_string_lossy())
+ .with_context("root", root.as_str())
.set_source(e)
})?;
}
@@ -90,7 +90,7 @@ impl Builder for CompfsBuilder {
)
})?;
let core = CompfsCore {
- root,
+ root: root.into(),
dispatcher,
buf_pool: oio::PooledBuf::new(16),
};
diff --git a/core/src/services/dbfs/mod.rs b/core/src/services/dbfs/mod.rs
index a3db37503d..98ac4f40d3 100644
--- a/core/src/services/dbfs/mod.rs
+++ b/core/src/services/dbfs/mod.rs
@@ -15,8 +15,8 @@
// specific language governing permissions and limitations
// under the License.
-pub use backend::DbfsConfig;
pub use backend::DbfsBuilder as Dbfs;
+pub use backend::DbfsConfig;
mod backend;
mod core;
diff --git a/core/src/services/github/backend.rs b/core/src/services/github/backend.rs
index 42dc055bf3..610df51d5d 100644
--- a/core/src/services/github/backend.rs
+++ b/core/src/services/github/backend.rs
@@ -77,7 +77,6 @@ impl Debug for GithubConfig {
#[derive(Default)]
pub struct GithubBuilder {
config: GithubConfig,
-
http_client: Option<HttpClient>,
}
@@ -151,21 +150,6 @@ impl Builder for GithubBuilder {
}
}
- /// Converts a HashMap into an GithubBuilder instance.
- ///
- /// # Arguments
- ///
- /// * `map` - A HashMap containing the configuration values.
- ///
- /// # Returns
- ///
- /// Returns an instance of GithubBuilder.
- fn from_map(map: HashMap<String, String>) -> Self {
- GithubConfig::deserialize(ConfigDeserializer::new(map))
- .map(Self::from_config)
- .expect("config deserialize must succeed");
- }
-
/// Builds the backend and returns the result of GithubBackend.
fn build(&mut self) -> Result<Self::Accessor> {
debug!("backend build started: {:?}", &self);
diff --git a/core/src/services/mini_moka/backend.rs b/core/src/services/mini_moka/backend.rs
index 6d33eb21d6..173e07a61f 100644
--- a/core/src/services/mini_moka/backend.rs
+++ b/core/src/services/mini_moka/backend.rs
@@ -19,12 +19,12 @@ use std::collections::HashMap;
use std::fmt::Debug;
use std::time::Duration;
+use crate::raw::adapters::typed_kv;
+use crate::*;
use log::debug;
use mini_moka::sync::Cache;
use mini_moka::sync::CacheBuilder;
use serde::{Deserialize, Serialize};
-use crate::raw::adapters::typed_kv;
-use crate::*;
/// Config for mini-moka support.
#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
@@ -90,9 +90,7 @@ impl Builder for MiniMokaBuilder {
type Config = MiniMokaConfig;
fn from_config(config: Self::Config) -> Self {
- Self {
- config: config,
- }
+ Self { config: config }
}
fn build(&mut self) -> Result<Self::Accessor> {
diff --git a/core/src/services/mod.rs b/core/src/services/mod.rs
index 3d3466730e..bc7c9de65e 100644
--- a/core/src/services/mod.rs
+++ b/core/src/services/mod.rs
@@ -99,9 +99,9 @@ pub use ghac::GhacConfig;
#[cfg(feature = "services-gridfs")]
mod gridfs;
#[cfg(feature = "services-gridfs")]
-pub use gridfs::Gridfs;
-#[cfg(feature = "services-gridfs")]
pub use gridfs::GridFsConfig;
+#[cfg(feature = "services-gridfs")]
+pub use gridfs::Gridfs;
#[cfg(feature = "services-hdfs")]
mod hdfs;
@@ -225,9 +225,9 @@ pub use self::rocksdb::RocksdbConfig;
#[cfg(feature = "services-s3")]
mod s3;
#[cfg(feature = "services-s3")]
-pub use s3::S3;
-#[cfg(feature = "services-s3")]
pub use s3::S3Config;
+#[cfg(feature = "services-s3")]
+pub use s3::S3;
#[cfg(feature = "services-sftp")]
mod sftp;
@@ -351,9 +351,9 @@ pub use sqlite::SqliteConfig;
#[cfg(feature = "services-d1")]
mod d1;
#[cfg(feature = "services-d1")]
-pub use self::d1::D1;
-#[cfg(feature = "services-d1")]
pub use self::d1::D1Config;
+#[cfg(feature = "services-d1")]
+pub use self::d1::D1;
#[cfg(feature = "services-azfile")]
mod azfile;
@@ -393,9 +393,9 @@ pub use alluxio::AlluxioConfig;
#[cfg(feature = "services-b2")]
mod b2;
#[cfg(feature = "services-b2")]
-pub use b2::B2;
-#[cfg(feature = "services-b2")]
pub use b2::B2Config;
+#[cfg(feature = "services-b2")]
+pub use b2::B2;
#[cfg(feature = "services-seafile")]
mod seafile;
diff --git a/core/src/services/obs/backend.rs b/core/src/services/obs/backend.rs
index 53c27299fd..c18cffcf17 100644
--- a/core/src/services/obs/backend.rs
+++ b/core/src/services/obs/backend.rs
@@ -36,7 +36,7 @@ use reqsign::HuaweicloudObsSigner;
use serde::{Deserialize, Serialize};
/// Config for Huawei-Cloud Object Storage Service (OBS) support.
-#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Default, Serialize, Deserialize, Clone, PartialEq, Eq)]
#[serde(default)]
#[non_exhaustive]
pub struct ObsConfig {
diff --git a/core/src/services/persy/backend.rs b/core/src/services/persy/backend.rs
index 5a163cb5e2..5af2ef7e5a 100644
--- a/core/src/services/persy/backend.rs
+++ b/core/src/services/persy/backend.rs
@@ -32,7 +32,7 @@ use crate::Scheme;
use crate::*;
/// Config for persy service support.
-#[derive(Default, Debug, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
#[serde(default)]
#[non_exhaustive]
pub struct PersyConfig {
diff --git a/core/src/services/vercel_artifacts/builder.rs b/core/src/services/vercel_artifacts/builder.rs
index 5994a1f3fa..8b10195a8b 100644
--- a/core/src/services/vercel_artifacts/builder.rs
+++ b/core/src/services/vercel_artifacts/builder.rs
@@ -36,7 +36,7 @@ pub struct VercelArtifactsConfig {
impl Debug for VercelArtifactsConfig {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.debug_struct("VercelArtifactsConfig")
- .field("access_token", "<redacted>")
+ .field("access_token", &"<redacted>")
.finish()
}
}
diff --git a/core/src/services/vercel_blob/backend.rs b/core/src/services/vercel_blob/backend.rs
index 0290134df8..fd252e5cee 100644
--- a/core/src/services/vercel_blob/backend.rs
+++ b/core/src/services/vercel_blob/backend.rs
@@ -119,7 +119,10 @@ impl Builder for VercelBlobBuilder {
type Config = VercelBlobConfig;
fn from_config(config: Self::Config) -> Self {
- VercelBlobBuilder { config, http_client: None }
+ VercelBlobBuilder {
+ config,
+ http_client: None,
+ }
}
/// Converts a HashMap into an VercelBlobBuilder instance.