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 2026/07/07 17:21:39 UTC
(opendal) branch main updated: fix(integrations/dav-server): depend only on opendal-core (#7876)
This is an automated email from the ASF dual-hosted git repository.
tisonkun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opendal.git
The following commit(s) were added to refs/heads/main by this push:
new 24aaff9c6 fix(integrations/dav-server): depend only on opendal-core (#7876)
24aaff9c6 is described below
commit 24aaff9c62b11efaadd9b8a3c6c7c05b55c9f474
Author: Gergely Nagy <ng...@users.noreply.github.com>
AuthorDate: Tue Jul 7 19:21:31 2026 +0200
fix(integrations/dav-server): depend only on opendal-core (#7876)
---
integrations/dav-server/Cargo.toml | 2 +-
integrations/dav-server/DEPENDENCIES.rust.tsv | 372 +++++++++++---------------
integrations/dav-server/src/dir.rs | 5 +-
integrations/dav-server/src/file.rs | 2 +-
integrations/dav-server/src/fs.rs | 6 +-
integrations/dav-server/src/lib.rs | 4 +-
integrations/dav-server/src/metadata.rs | 2 +-
integrations/dav-server/src/utils.rs | 6 +-
8 files changed, 164 insertions(+), 235 deletions(-)
diff --git a/integrations/dav-server/Cargo.toml b/integrations/dav-server/Cargo.toml
index c95539d77..67033d3b8 100644
--- a/integrations/dav-server/Cargo.toml
+++ b/integrations/dav-server/Cargo.toml
@@ -32,7 +32,7 @@ anyhow = "1"
bytes = { version = "1.4.0" }
dav-server = { version = "0.11.0" }
futures = "0.3"
-opendal = { version = "0.58.0", path = "../../core" }
+opendal-core = { version = "0.58.0", path = "../../core/core", default-features = false }
[dev-dependencies]
opendal = { version = "0.58.0", path = "../../core", features = [
diff --git a/integrations/dav-server/DEPENDENCIES.rust.tsv b/integrations/dav-server/DEPENDENCIES.rust.tsv
index 9eb5dc5ba..83f4182d7 100644
--- a/integrations/dav-server/DEPENDENCIES.rust.tsv
+++ b/integrations/dav-server/DEPENDENCIES.rust.tsv
@@ -1,221 +1,151 @@
-crate Apache-2.0 Apache-2.0 WITH LLVM-exception BSD-3-Clause CC0-1.0 CDLA-Permissive-2.0 ISC LGPL-2.1-or-later MIT MIT-0 MPL-2.0 Unicode-3.0 Unlicense Zlib
-allocator-api2@0.2.21 X X
-android_system_properties@0.1.5 X X
-anyhow@1.0.103 X X
-atomic-waker@1.1.2 X X
-autocfg@1.5.1 X X
-aws-lc-rs@1.17.1 X X
-aws-lc-sys@0.42.0 X X X X X
-backon@1.6.0 X
-base64@0.22.1 X X
-bitflags@2.13.0 X X
-block-buffer@0.10.4 X X
-block-buffer@0.12.1 X X
-bumpalo@3.20.3 X X
-bytes@1.12.0 X
-cc@1.2.66 X X
-cfg-if@1.0.4 X X
-chrono@0.4.45 X X
-cmake@0.1.58 X X
-combine@4.6.7 X
-const-oid@0.10.2 X X
-core-foundation@0.10.1 X X
-core-foundation-sys@0.8.7 X X
-cpufeatures@0.2.17 X X
-crypto-common@0.1.7 X X
-crypto-common@0.2.2 X X
-ctor@1.0.8 X X
-dav-server@0.11.0 X
-dav-server-opendalfs@0.7.3 X
-derive-where@1.6.1 X X
-digest@0.10.7 X X
-digest@0.11.3 X X
-displaydoc@0.2.6 X X
-dunce@1.0.5 X X X
-dyn-clone@1.0.20 X X
-equivalent@1.0.2 X X
-errno@0.3.14 X X
-fastrand@2.4.1 X X
-find-msvc-tools@0.1.9 X X
-foldhash@0.2.0 X
-form_urlencoded@1.2.2 X X
-fs_extra@1.3.0 X
-futures@0.3.32 X X
-futures-channel@0.3.32 X X
-futures-core@0.3.32 X X
-futures-executor@0.3.32 X X
-futures-io@0.3.32 X X
-futures-macro@0.3.32 X X
-futures-sink@0.3.32 X X
-futures-task@0.3.32 X X
-futures-util@0.3.32 X X
-generic-array@0.14.7 X
-getrandom@0.4.3 X X
-gloo-timers@0.3.0 X X
-hashbrown@0.16.1 X X
-headers@0.4.1 X
-headers-core@0.3.0 X
-htmlescape@0.3.1 X X X
-http@1.4.2 X X
-http-body@1.0.1 X
-http-body-util@0.1.3 X
-httparse@1.10.1 X X
-httpdate@1.0.3 X X
-hybrid-array@0.4.13 X X
-hyper@1.10.1 X
-hyper-rustls@0.27.9 X X X
-hyper-util@0.1.20 X
-iana-time-zone@0.1.65 X X
-iana-time-zone-haiku@0.1.2 X X
-icu_collections@2.2.0 X
-icu_locale_core@2.2.0 X
-icu_normalizer@2.2.0 X
-icu_normalizer_data@2.2.0 X
-icu_properties@2.2.0 X
-icu_properties_data@2.2.0 X
-icu_provider@2.2.0 X
-idna@1.1.0 X X
-idna_adapter@1.2.2 X X
-ipnet@2.12.0 X X
-itoa@1.0.18 X X
-jiff@0.2.31 X X
-jiff-tzdb@0.1.7 X X
-jiff-tzdb-platform@0.1.3 X X
-jni@0.22.4 X X
-jni-macros@0.22.4 X X
-jni-sys@0.4.1 X X
-jni-sys-macros@0.4.1 X X
-jobserver@0.1.35 X X
-js-sys@0.3.103 X X
-libc@0.2.186 X X
-link-section@0.19.0 X X
-linktime-proc-macro@0.2.0 X X
-linux-raw-sys@0.12.1 X X X
-litemap@0.8.2 X
-lock_api@0.4.14 X X
-log@0.4.33 X X
-lru@0.16.4 X
-md-5@0.11.0 X X
-mea@0.6.4 X
-memchr@2.8.2 X X
-mime@0.3.17 X X
-mime_guess@2.0.5 X
-mio@1.2.1 X
-num-traits@0.2.19 X X
-once_cell@1.21.4 X X
-opendal@0.58.0 X
-opendal-core@0.58.0 X
-opendal-http-transport-reqwest@0.58.0 X
-opendal-layer-concurrent-limit@0.58.0 X
-opendal-layer-logging@0.58.0 X
-opendal-layer-retry@0.58.0 X
-opendal-layer-timeout@0.58.0 X
-opendal-service-fs@0.58.0 X
-openssl-probe@0.2.1 X X
-parking_lot@0.12.5 X X
-parking_lot_core@0.9.12 X X
-percent-encoding@2.3.2 X X
-pin-project-lite@0.2.17 X X
-pkg-config@0.3.33 X X
-portable-atomic@1.13.1 X X
-portable-atomic-util@0.2.7 X X
-potential_utf@0.1.5 X
-proc-macro2@1.0.106 X X
-quick-xml@0.41.0 X
-quote@1.0.46 X X
-r-efi@6.0.0 X X X
-redox_syscall@0.5.18 X
-reflink-copy@0.1.30 X X
-reqwest@0.13.4 X X
-rustc_version@0.4.1 X X
-rustix@1.1.4 X X X
-rustls@0.23.41 X X X
-rustls-native-certs@0.8.4 X X X
-rustls-pki-types@1.15.0 X X
-rustls-platform-verifier@0.7.0 X X
-rustls-platform-verifier-android@0.1.1 X X
-rustls-webpki@0.103.13 X
-rustversion@1.0.22 X X
-same-file@1.0.6 X X
-schannel@0.1.29 X
-scopeguard@1.2.0 X X
-security-framework@3.7.0 X X
-security-framework-sys@2.17.0 X X
-semver@1.0.28 X X
-serde@1.0.228 X X
-serde_core@1.0.228 X X
-serde_derive@1.0.228 X X
-serde_json@1.0.150 X X
-sha1@0.10.6 X X
-shlex@2.0.1 X X
-simd_cesu8@1.1.1 X X
-simdutf8@0.1.5 X X
-slab@0.4.12 X
-smallvec@1.15.2 X X
-socket2@0.6.4 X X
-stable_deref_trait@1.2.1 X X
-subtle@2.6.1 X
-syn@2.0.118 X X
-sync_wrapper@1.0.2 X
-synstructure@0.13.2 X
-thiserror@2.0.18 X X
-thiserror-impl@2.0.18 X X
-tinystr@0.8.3 X
-tokio@1.52.3 X
-tokio-macros@2.7.0 X
-tokio-rustls@0.26.4 X X
-tokio-util@0.7.18 X
-tower@0.5.3 X
-tower-http@0.6.11 X
-tower-layer@0.3.3 X
-tower-service@0.3.3 X
-tracing@0.1.44 X
-tracing-core@0.1.36 X
-try-lock@0.2.5 X
-typenum@1.20.1 X X
-unicase@2.9.0 X X
-unicode-ident@1.0.24 X X X
-untrusted@0.9.0 X
-url@2.5.8 X X
-utf8_iter@1.0.4 X X
-uuid@1.23.4 X X
-version_check@0.9.5 X X
-walkdir@2.5.0 X X
-want@0.3.1 X
-wasi@0.11.1+wasi-snapshot-preview1 X X X
-wasm-bindgen@0.2.126 X X
-wasm-bindgen-futures@0.4.76 X X
-wasm-bindgen-macro@0.2.126 X X
-wasm-bindgen-macro-support@0.2.126 X X
-wasm-bindgen-shared@0.2.126 X X
-wasm-streams@0.5.0 X X
-web-sys@0.3.103 X X
-web-time@1.1.0 X X
-webpki-root-certs@1.0.8 X
-winapi-util@0.1.11 X X
-windows@0.62.2 X X
-windows-collections@0.3.2 X X
-windows-core@0.62.2 X X
-windows-future@0.3.2 X X
-windows-implement@0.60.2 X X
-windows-interface@0.59.3 X X
-windows-link@0.2.1 X X
-windows-numerics@0.3.1 X X
-windows-result@0.4.1 X X
-windows-strings@0.5.1 X X
-windows-sys@0.61.2 X X
-windows-threading@0.2.1 X X
-writeable@0.6.3 X
-xattr@1.6.1 X X
-xml@1.3.0 X
-xml-rs@1.0.0 X
-xmltree@0.12.0 X
-yoke@0.8.3 X
-yoke-derive@0.8.2 X
-zerofrom@0.1.8 X
-zerofrom-derive@0.1.7 X
-zeroize@1.9.0 X X
-zerotrie@0.2.4 X
-zerovec@0.11.6 X
-zerovec-derive@0.11.3 X
-zmij@1.0.21 X
+crate Apache-2.0 Apache-2.0 WITH LLVM-exception LGPL-2.1-or-later MIT MPL-2.0 Unicode-3.0 Unlicense Zlib
+allocator-api2@0.2.21 X X
+android_system_properties@0.1.5 X X
+anyhow@1.0.103 X X
+autocfg@1.5.1 X X
+base64@0.22.1 X X
+bitflags@2.13.0 X X
+block-buffer@0.10.4 X X
+block-buffer@0.12.1 X X
+bumpalo@3.20.3 X X
+bytes@1.12.0 X
+cc@1.2.66 X X
+cfg-if@1.0.4 X X
+chrono@0.4.45 X X
+const-oid@0.10.2 X X
+core-foundation-sys@0.8.7 X X
+cpufeatures@0.2.17 X X
+crypto-common@0.1.7 X X
+crypto-common@0.2.2 X X
+dav-server@0.11.0 X
+dav-server-opendalfs@0.7.3 X
+derive-where@1.6.1 X X
+digest@0.10.7 X X
+digest@0.11.3 X X
+displaydoc@0.2.6 X X
+dyn-clone@1.0.20 X X
+equivalent@1.0.2 X X
+errno@0.3.14 X X
+find-msvc-tools@0.1.9 X X
+foldhash@0.2.0 X
+form_urlencoded@1.2.2 X X
+futures@0.3.32 X X
+futures-channel@0.3.32 X X
+futures-core@0.3.32 X X
+futures-executor@0.3.32 X X
+futures-io@0.3.32 X X
+futures-macro@0.3.32 X X
+futures-sink@0.3.32 X X
+futures-task@0.3.32 X X
+futures-util@0.3.32 X X
+generic-array@0.14.7 X
+getrandom@0.4.3 X X
+hashbrown@0.16.1 X X
+headers@0.4.1 X
+headers-core@0.3.0 X
+htmlescape@0.3.1 X X X
+http@1.4.2 X X
+http-body@1.0.1 X
+http-body-util@0.1.3 X
+httpdate@1.0.3 X X
+hybrid-array@0.4.13 X X
+iana-time-zone@0.1.65 X X
+iana-time-zone-haiku@0.1.2 X X
+icu_collections@2.2.0 X
+icu_locale_core@2.2.0 X
+icu_normalizer@2.2.0 X
+icu_normalizer_data@2.2.0 X
+icu_properties@2.2.0 X
+icu_properties_data@2.2.0 X
+icu_provider@2.2.0 X
+idna@1.1.0 X X
+idna_adapter@1.2.2 X X
+itoa@1.0.18 X X
+jiff@0.2.31 X X
+jiff-tzdb@0.1.7 X X
+jiff-tzdb-platform@0.1.3 X X
+jobserver@0.1.35 X X
+js-sys@0.3.103 X X
+libc@0.2.186 X X
+linux-raw-sys@0.12.1 X X X
+litemap@0.8.2 X
+lock_api@0.4.14 X X
+log@0.4.33 X X
+lru@0.16.4 X
+md-5@0.11.0 X X
+mea@0.6.4 X
+memchr@2.8.2 X X
+mime@0.3.17 X X
+mime_guess@2.0.5 X
+mio@1.2.1 X
+num-traits@0.2.19 X X
+once_cell@1.21.4 X X
+opendal-core@0.58.0 X
+parking_lot@0.12.5 X X
+parking_lot_core@0.9.12 X X
+percent-encoding@2.3.2 X X
+pin-project-lite@0.2.17 X X
+portable-atomic@1.13.1 X X
+portable-atomic-util@0.2.7 X X
+potential_utf@0.1.5 X
+proc-macro2@1.0.106 X X
+quick-xml@0.41.0 X
+quote@1.0.46 X X
+r-efi@6.0.0 X X X
+redox_syscall@0.5.18 X
+reflink-copy@0.1.30 X X
+rustix@1.1.4 X X X
+rustversion@1.0.23 X X
+scopeguard@1.2.0 X X
+serde@1.0.228 X X
+serde_core@1.0.228 X X
+serde_derive@1.0.228 X X
+serde_json@1.0.150 X X
+sha1@0.10.6 X X
+shlex@2.0.1 X X
+slab@0.4.12 X
+smallvec@1.15.2 X X
+socket2@0.6.4 X X
+stable_deref_trait@1.2.1 X X
+syn@2.0.118 X X
+synstructure@0.13.2 X
+tinystr@0.8.3 X
+tokio@1.52.3 X
+tokio-macros@2.7.0 X
+typenum@1.20.1 X X
+unicase@2.9.0 X X
+unicode-ident@1.0.24 X X X
+url@2.5.8 X X
+utf8_iter@1.0.4 X X
+uuid@1.23.4 X X
+version_check@0.9.5 X X
+wasi@0.11.1+wasi-snapshot-preview1 X X X
+wasm-bindgen@0.2.126 X X
+wasm-bindgen-macro@0.2.126 X X
+wasm-bindgen-macro-support@0.2.126 X X
+wasm-bindgen-shared@0.2.126 X X
+web-time@1.1.0 X X
+windows@0.62.2 X X
+windows-collections@0.3.2 X X
+windows-core@0.62.2 X X
+windows-future@0.3.2 X X
+windows-implement@0.60.2 X X
+windows-interface@0.59.3 X X
+windows-link@0.2.1 X X
+windows-numerics@0.3.1 X X
+windows-result@0.4.1 X X
+windows-strings@0.5.1 X X
+windows-sys@0.61.2 X X
+windows-threading@0.2.1 X X
+writeable@0.6.3 X
+xml@1.3.0 X
+xml-rs@1.0.0 X
+xmltree@0.12.0 X
+yoke@0.8.3 X
+yoke-derive@0.8.2 X
+zerofrom@0.1.8 X
+zerofrom-derive@0.1.7 X
+zerotrie@0.2.4 X
+zerovec@0.11.6 X
+zerovec-derive@0.11.3 X
+zmij@1.0.21 X
diff --git a/integrations/dav-server/src/dir.rs b/integrations/dav-server/src/dir.rs
index abef18b62..9546a2265 100644
--- a/integrations/dav-server/src/dir.rs
+++ b/integrations/dav-server/src/dir.rs
@@ -20,9 +20,8 @@ use super::utils::*;
use dav_server::fs::{DavDirEntry, DavMetaData, FsResult};
use futures::StreamExt;
use futures::{FutureExt, Stream};
-use opendal::Operator;
-use opendal::raw::normalize_path;
-use opendal::{Entry, Lister};
+use opendal_core::raw::normalize_path;
+use opendal_core::{Entry, Lister, Operator};
use std::pin::Pin;
use std::task::Poll::Ready;
use std::task::{Context, Poll, ready};
diff --git a/integrations/dav-server/src/file.rs b/integrations/dav-server/src/file.rs
index 1f21cf882..209ac60fd 100644
--- a/integrations/dav-server/src/file.rs
+++ b/integrations/dav-server/src/file.rs
@@ -24,7 +24,7 @@ use dav_server::fs::{DavMetaData, FsResult};
use dav_server::fs::{FsError, FsFuture};
use futures::FutureExt;
use futures::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
-use opendal::{FuturesAsyncReader, FuturesAsyncWriter, Operator};
+use opendal_core::{FuturesAsyncReader, FuturesAsyncWriter, Operator};
use super::metadata::OpendalMetaData;
use super::utils::*;
diff --git a/integrations/dav-server/src/fs.rs b/integrations/dav-server/src/fs.rs
index ea8e63f9d..8edcf21b7 100644
--- a/integrations/dav-server/src/fs.rs
+++ b/integrations/dav-server/src/fs.rs
@@ -23,7 +23,7 @@ use dav_server::fs::{DavFile, FsStream};
use dav_server::fs::{DavFileSystem, ReadDirMeta};
use futures::FutureExt;
use futures::StreamExt;
-use opendal::Operator;
+use opendal_core::Operator;
use std::path::Path;
use super::dir::OpendalStream;
@@ -38,8 +38,8 @@ use super::utils::convert_error;
/// use dav_server::davpath::DavPath;
/// use dav_server::fs::DavFileSystem;
/// use dav_server_opendalfs::OpendalFs;
-/// use opendal::services::Memory;
-/// use opendal::Operator;
+/// use opendal_core::services::Memory;
+/// use opendal_core::Operator;
///
/// #[tokio::test]
/// async fn test() -> Result<()> {
diff --git a/integrations/dav-server/src/lib.rs b/integrations/dav-server/src/lib.rs
index 30eefd7b6..e3909466e 100644
--- a/integrations/dav-server/src/lib.rs
+++ b/integrations/dav-server/src/lib.rs
@@ -24,8 +24,8 @@
//! use dav_server::davpath::DavPath;
//! use dav_server::fs::DavFileSystem;
//! use dav_server_opendalfs::OpendalFs;
-//! use opendal::services::Memory;
-//! use opendal::Operator;
+//! use opendal_core::services::Memory;
+//! use opendal_core::Operator;
//!
//! #[tokio::test]
//! async fn test() -> Result<()> {
diff --git a/integrations/dav-server/src/metadata.rs b/integrations/dav-server/src/metadata.rs
index 5112029c9..94af0368a 100644
--- a/integrations/dav-server/src/metadata.rs
+++ b/integrations/dav-server/src/metadata.rs
@@ -17,7 +17,7 @@
use dav_server::fs::FsError;
use dav_server::fs::{DavMetaData, FsResult};
-use opendal::Metadata;
+use opendal_core::Metadata;
use std::time::SystemTime;
/// OpendalMetaData is a `DavMetaData` implementation for opendal.
diff --git a/integrations/dav-server/src/utils.rs b/integrations/dav-server/src/utils.rs
index 132712f26..fbd458429 100644
--- a/integrations/dav-server/src/utils.rs
+++ b/integrations/dav-server/src/utils.rs
@@ -15,12 +15,12 @@
// specific language governing permissions and limitations
// under the License.
-pub fn convert_error(opendal_error: opendal::Error) -> dav_server::fs::FsError {
+pub fn convert_error(opendal_error: opendal_core::Error) -> dav_server::fs::FsError {
match opendal_error.kind() {
- opendal::ErrorKind::AlreadyExists | opendal::ErrorKind::IsSameFile => {
+ opendal_core::ErrorKind::AlreadyExists | opendal_core::ErrorKind::IsSameFile => {
dav_server::fs::FsError::Exists
}
- opendal::ErrorKind::NotFound => dav_server::fs::FsError::NotFound,
+ opendal_core::ErrorKind::NotFound => dav_server::fs::FsError::NotFound,
_ => dav_server::fs::FsError::GeneralFailure,
}
}