This is an automated email from the ASF dual-hosted git repository.

xuanwo pushed a commit to branch bump-versions
in repository https://gitbox.apache.org/repos/asf/opendal.git

commit 1bb816c8268e2eacab77f969b9805991d8d76691
Author: Xuanwo <[email protected]>
AuthorDate: Tue Jun 18 17:55:05 2024 +0800

    Merge with main
    
    Signed-off-by: Xuanwo <[email protected]>
---
 core/Cargo.lock                            | 12 ++++----
 core/Cargo.toml                            | 44 +++++++++++++++---------------
 core/examples/basic/Cargo.toml             |  2 +-
 core/examples/concurrent-upload/Cargo.toml |  2 +-
 core/examples/multipart-upload/Cargo.toml  |  2 +-
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/core/Cargo.lock b/core/Cargo.lock
index f0e320228a..950f4e124f 100644
--- a/core/Cargo.lock
+++ b/core/Cargo.lock
@@ -2421,7 +2421,7 @@ dependencies = [
 
 [[package]]
 name = "edge_test_aws_s3_assume_role_with_web_identity"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "opendal",
  "tokio",
@@ -2430,7 +2430,7 @@ dependencies = [
 
 [[package]]
 name = "edge_test_file_write_on_full_disk"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "futures",
  "opendal",
@@ -2440,7 +2440,7 @@ dependencies = [
 
 [[package]]
 name = "edge_test_s3_read_on_wasm"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "opendal",
  "wasm-bindgen",
@@ -4856,7 +4856,7 @@ dependencies = [
 
 [[package]]
 name = "opendal-examples-basic"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "futures",
  "opendal",
@@ -4865,7 +4865,7 @@ dependencies = [
 
 [[package]]
 name = "opendal-examples-concurrent-upload"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "futures",
  "opendal",
@@ -4874,7 +4874,7 @@ dependencies = [
 
 [[package]]
 name = "opendal-examples-multipart-upload"
-version = "0.47.0"
+version = "0.47.1"
 dependencies = [
  "futures",
  "opendal",
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 4a8032939c..ec92036538 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -235,13 +235,13 @@ backon = "0.4.4"
 base64 = "0.22"
 bytes = "1.6"
 chrono = { version = "0.4.28", default-features = false, features = [
-    "clock",
-    "std",
+  "clock",
+  "std",
 ] }
 flagset = "0.4"
 futures = { version = "0.3", default-features = false, features = [
-    "std",
-    "async-await",
+  "std",
+  "async-await",
 ] }
 http = "1.1"
 log = "0.4"
@@ -282,8 +282,8 @@ bb8-postgres = { version = "0.8.1", optional = true }
 tokio-postgres = { version = "0.7.8", optional = true }
 # for services-cacache
 cacache = { version = "13.0", default-features = false, features = [
-    "tokio-runtime",
-    "mmap",
+  "tokio-runtime",
+  "mmap",
 ], optional = true }
 # for services-dashmap
 dashmap = { version = "5.4", optional = true }
@@ -291,7 +291,7 @@ dashmap = { version = "5.4", optional = true }
 etcd-client = { version = "0.12", optional = true, features = ["tls"] }
 # for services-foundationdb
 foundationdb = { version = "0.8.0", features = [
-    "embedded-fdb-include",
+  "embedded-fdb-include",
 ], optional = true }
 # for services-hdfs
 hdrs = { version = "0.3.2", optional = true, features = ["async_file"] }
@@ -307,13 +307,13 @@ moka = { version = "0.12", optional = true, features = 
["future", "sync"] }
 mongodb = { version = "2.8.1", optional = true, features = ["tokio-runtime"] }
 # for services-mysql
 mysql_async = { version = "0.32.2", default-features = false, features = [
-    "default-rustls",
+  "default-rustls",
 ], optional = true }
 # for services-sftp
 openssh = { version = "0.10.0", optional = true }
 openssh-sftp-client = { version = "0.14.0", optional = true, features = [
-    "openssh",
-    "tracing",
+  "openssh",
+  "tracing",
 ] }
 # for services-persy
 persy = { version = "1.4.6", optional = true }
@@ -321,9 +321,9 @@ persy = { version = "1.4.6", optional = true }
 redb = { version = "1.1.0", optional = true }
 # for services-redis
 redis = { version = "0.23.1", features = [
-    "cluster-async",
-    "tokio-comp",
-    "connection-manager",
+  "cluster-async",
+  "tokio-comp",
+  "connection-manager",
 ], optional = true }
 # for services-rocksdb
 rocksdb = { version = "0.21.0", default-features = false, optional = true }
@@ -333,9 +333,9 @@ rusqlite = { version = "0.31.0", optional = true, features 
= ["bundled"] }
 sled = { version = "0.34.7", optional = true }
 # for services-ftp
 suppaftp = { version = "5.3.1", default-features = false, features = [
-    "async-secure",
-    "rustls",
-    "async-rustls",
+  "async-secure",
+  "rustls",
+  "async-rustls",
 ], optional = true }
 # for services-tikv
 tikv-client = { version = "0.3.0", optional = true, default-features = false }
@@ -345,9 +345,9 @@ hdfs-native = { version = "0.9.4", optional = true }
 surrealdb = { version = "1.3.0", optional = true, features = ["protocol-http"] 
}
 # for services-compfs
 compio = { version = "0.10.0", optional = true, features = [
-    "runtime",
-    "bytes",
-    "polling",
+  "runtime",
+  "bytes",
+  "polling",
 ] }
 # for services-s3
 crc32c = { version = "0.6.6", optional = true }
@@ -385,7 +385,7 @@ dotenvy = "0.15"
 libtest-mimic = "0.6"
 minitrace = { version = "0.6", features = ["enable"] }
 opentelemetry = { version = "0.21", default-features = false, features = [
-    "trace",
+  "trace",
 ] }
 pretty_assertions = "1"
 rand = "0.8"
@@ -393,6 +393,6 @@ sha2 = "0.10"
 size = "0.4"
 tokio = { version = "1.27", features = ["fs", "macros", "rt-multi-thread"] }
 tracing-subscriber = { version = "0.3", features = [
-    "env-filter",
-    "tracing-log",
+  "env-filter",
+  "tracing-log",
 ] }
diff --git a/core/examples/basic/Cargo.toml b/core/examples/basic/Cargo.toml
index 185d4b8e51..0b5b382d47 100644
--- a/core/examples/basic/Cargo.toml
+++ b/core/examples/basic/Cargo.toml
@@ -19,9 +19,9 @@
 name = "opendal-examples-basic"
 publish = false
 
-version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 futures = "0.3"
diff --git a/core/examples/concurrent-upload/Cargo.toml 
b/core/examples/concurrent-upload/Cargo.toml
index 8a9ba0963f..0c6367d686 100644
--- a/core/examples/concurrent-upload/Cargo.toml
+++ b/core/examples/concurrent-upload/Cargo.toml
@@ -19,9 +19,9 @@
 name = "opendal-examples-concurrent-upload"
 publish = false
 
-version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 futures = "0.3"
diff --git a/core/examples/multipart-upload/Cargo.toml 
b/core/examples/multipart-upload/Cargo.toml
index 575f37aa33..84fedf14eb 100644
--- a/core/examples/multipart-upload/Cargo.toml
+++ b/core/examples/multipart-upload/Cargo.toml
@@ -19,9 +19,9 @@
 name = "opendal-examples-multipart-upload"
 publish = false
 
-version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
+version.workspace = true
 
 [dependencies]
 futures = "0.3"

Reply via email to