You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by ps...@apache.org on 2025/10/16 09:29:25 UTC
(opendal-ofs) 03/03: chore: adjust rust and cargo configs
This is an automated email from the ASF dual-hosted git repository.
psiace pushed a commit to branch prepare
in repository https://gitbox.apache.org/repos/asf/opendal-ofs.git
commit 96bc59f0bd683d61c4fd0c6a928e1844b3c1b011
Author: Chojan Shang <ps...@apache.org>
AuthorDate: Thu Oct 16 17:29:04 2025 +0800
chore: adjust rust and cargo configs
Signed-off-by: Chojan Shang <ps...@apache.org>
---
Cargo.toml | 8 +++----
integrations/cloud_filter/Cargo.toml | 4 ++--
integrations/fuse3/Cargo.toml | 2 +-
.../fuse3/Cargo.toml => rust-toolchain.toml | 26 +++-----------------
integrations/fuse3/Cargo.toml => rustfmt.toml | 28 ++++++----------------
5 files changed, 17 insertions(+), 51 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 528612a..5f45aac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ anyhow = { version = "1" }
clap = { version = "4.5.40", features = ["derive", "env"] }
log = { version = "0.4.22" }
logforth = { version = "0.28.1", features = ["starter-log"] }
-opendal = { version = "0.54.0", path = "../../core" }
+opendal = { version = "0.54.0" }
tokio = { version = "1.47.0", features = [
"fs",
"macros",
@@ -46,13 +46,13 @@ url = { version = "2.5.4" }
[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
fuse3 = { version = "0.8.1", "features" = ["tokio-runtime", "unprivileged"] }
-fuse3_opendal = { version = "0.0.19", path = "../../integrations/fuse3" }
+fuse3_opendal = { version = "0.0.19", path = "integrations/fuse3" }
libc = "0.2.154"
nix = { version = "0.30.1", features = ["user"] }
[target.'cfg(target_os = "windows")'.dependencies]
cloud-filter = { version = "0.0.6" }
-cloud_filter_opendal = { version = "0.0.12", path = "../../integrations/cloud_filter" }
+cloud_filter_opendal = { version = "0.0.12", path = "integrations/cloud_filter" }
[features]
default = ["services-fs", "services-s3"]
@@ -60,7 +60,7 @@ services-fs = ["opendal/services-fs"]
services-s3 = ["opendal/services-s3"]
[dev-dependencies]
-opendal = { version = "0.54.0", path = "../../core", features = ["tests"] }
+opendal = { version = "0.54.0", features = ["tests"] }
tempfile = "3.23.0"
test-context = "0.4.1"
walkdir = "2.5.0"
diff --git a/integrations/cloud_filter/Cargo.toml b/integrations/cloud_filter/Cargo.toml
index f432c1c..8c57753 100644
--- a/integrations/cloud_filter/Cargo.toml
+++ b/integrations/cloud_filter/Cargo.toml
@@ -35,13 +35,13 @@ bincode = "1.3.3"
cloud-filter = "0.0.6"
futures = "0.3.30"
log = "0.4.17"
-opendal = { version = "0.54.0", path = "../../core" }
+opendal = { version = "0.54.0" }
serde = { version = "1.0.203", features = ["derive"] }
[dev-dependencies]
libtest-mimic = { version = "0.8.1" }
logforth = { version = "0.23.1", default-features = false }
-opendal = { version = "0.54.0", path = "../../core", features = [
+opendal = { version = "0.54.0", features = [
"services-fs",
"tests",
] }
diff --git a/integrations/fuse3/Cargo.toml b/integrations/fuse3/Cargo.toml
index e025e5a..3aeb0bd 100644
--- a/integrations/fuse3/Cargo.toml
+++ b/integrations/fuse3/Cargo.toml
@@ -33,7 +33,7 @@ fuse3 = { version = "0.8.1", "features" = ["tokio-runtime", "unprivileged"] }
futures-util = "0.3.30"
libc = "0.2.155"
log = "0.4.21"
-opendal = { version = "0.54.0", path = "../../core" }
+opendal = { version = "0.54.0" }
sharded-slab = "0.1.7"
tokio = "1.38.0"
diff --git a/integrations/fuse3/Cargo.toml b/rust-toolchain.toml
similarity index 57%
copy from integrations/fuse3/Cargo.toml
copy to rust-toolchain.toml
index e025e5a..24ee9ce 100644
--- a/integrations/fuse3/Cargo.toml
+++ b/rust-toolchain.toml
@@ -15,26 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-[package]
-description = "fuse3 integration for Apache OpenDAL"
-name = "fuse3_opendal"
-
-authors = ["Apache OpenDAL <de...@opendal.apache.org>"]
-edition = "2024"
-homepage = "https://opendal.apache.org/"
-license = "Apache-2.0"
-repository = "https://github.com/apache/opendal"
-rust-version = "1.85"
-version = "0.0.19"
-
-[dependencies]
-bytes = "1.6.0"
-fuse3 = { version = "0.8.1", "features" = ["tokio-runtime", "unprivileged"] }
-futures-util = "0.3.30"
-libc = "0.2.155"
-log = "0.4.21"
-opendal = { version = "0.54.0", path = "../../core" }
-sharded-slab = "0.1.7"
-tokio = "1.38.0"
-
-[dev-dependencies]
+[toolchain]
+channel = "stable"
+components = ["cargo", "rustfmt", "clippy", "rust-analyzer"]
diff --git a/integrations/fuse3/Cargo.toml b/rustfmt.toml
similarity index 58%
copy from integrations/fuse3/Cargo.toml
copy to rustfmt.toml
index e025e5a..383062d 100644
--- a/integrations/fuse3/Cargo.toml
+++ b/rustfmt.toml
@@ -15,26 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-[package]
-description = "fuse3 integration for Apache OpenDAL"
-name = "fuse3_opendal"
-
-authors = ["Apache OpenDAL <de...@opendal.apache.org>"]
edition = "2024"
-homepage = "https://opendal.apache.org/"
-license = "Apache-2.0"
-repository = "https://github.com/apache/opendal"
-rust-version = "1.85"
-version = "0.0.19"
-
-[dependencies]
-bytes = "1.6.0"
-fuse3 = { version = "0.8.1", "features" = ["tokio-runtime", "unprivileged"] }
-futures-util = "0.3.30"
-libc = "0.2.155"
-log = "0.4.21"
-opendal = { version = "0.54.0", path = "../../core" }
-sharded-slab = "0.1.7"
-tokio = "1.38.0"
+reorder_imports = true
-[dev-dependencies]
+# format_code_in_doc_comments = true
+# group_imports = "StdExternalCrate"
+# imports_granularity = "Item"
+# overflow_delimited_expr = true
+# trailing_comma = "Vertical"
+# where_single_line = true