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 <[email protected]>
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
[email protected]  X                                                       
X                                       
[email protected]        X                                       
                X                                       
[email protected] X                                                       X       
                                
[email protected]     X                                                       
X                                       
[email protected]  X                                                       X       
                                
[email protected]       X                                       X               
                                        
[email protected]      X               X                       X               
X       X                               
[email protected]   X                                                               
                                
[email protected]  X                                                       X       
                                
[email protected]        X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected] X                                                       X       
                                
[email protected]                                                           X       
                                
[email protected]      X                                                       X       
                                
[email protected]   X                                                       X       
                                
[email protected]  X                                                       X       
                                
[email protected]   X                                                       X       
                                
[email protected]                                                          X       
                                
[email protected]       X                                                       
X                                       
[email protected] X                                                       
X                                       
[email protected]      X                                               
        X                                       
[email protected]     X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected]     X                                                       X       
                                
[email protected]      X                                                       
                                        
[email protected]     X                                               
                                                
[email protected]     X                                                       
X                                       
[email protected]  X                                                       X       
                                
[email protected]  X                                                       X       
                                
[email protected]       X                                                       
X                                       
[email protected]    X                       X                                       
X                               
[email protected]       X                                                       
X                                       
[email protected]       X                                                       
X                                       
[email protected]   X                                                       X       
                                
[email protected] X                                                       X       
                                
[email protected]  X                                                       
X                                       
[email protected]                                                                 
                                X
[email protected]  X                                                       
X                                       
[email protected]                                                         X       
                                
[email protected] X                                                       X       
                                
[email protected] X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected]        X                                               
        X                                       
[email protected]      X                                                       
X                                       
[email protected]   X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected]    X                                                       
X                                       
[email protected]                                                           
X                                       
[email protected]        X                                                       
X                                       
[email protected]      X                                                       
X                                       
[email protected]       X                                                       
X                                       
[email protected]                                                          X       
                                
[email protected]                                                             
X                                       
[email protected]       X                                                       
X               X                       
[email protected]     X                                                       X       
                                
[email protected]                                                                
X                                       
[email protected]                                                           
X                                       
[email protected]        X                                                       
X                                       
[email protected] X                                                       X       
                                
[email protected]    X                                                       
X                                       
[email protected]                                                           X       
                                
[email protected]    X                                       X               
X                                       
[email protected]                                                              
X                                       
[email protected]  X                                                       
X                                       
[email protected]     X                                               
        X                                       
[email protected]                                                          
                        X               
[email protected]                                                          
                        X               
[email protected]                                                           
                        X               
[email protected]                                                      
                                X               
[email protected]                                                           
                        X               
[email protected]                                                      
                                X               
[email protected]                                                             
                        X               
[email protected]     X                                                       X       
                                
[email protected]     X                                                       
X                                       
[email protected]   X                                                       X       
                                
[email protected]    X                                                       X       
                                
[email protected]                                                            X       
                        X       
[email protected]                                                                
X                               X       
[email protected]                                                       
        X                               X       
[email protected]     X                                                       X       
                                
[email protected]      X                                                       
X                                       
[email protected]  X                                                       X       
                                
[email protected]   X                                                       
X                                       
[email protected]       X                                                       
X                                       
[email protected] X                                                       X       
                                
[email protected]   X                                                       X       
                                
[email protected]    X                                                       
X                                       
[email protected]      X                                               
        X                                       
[email protected]   X       X                                               
X                                       
[email protected]                                                                  
                X               
[email protected]        X                                                       
X                                       
[email protected]     X                                                       X       
                                
[email protected]                                                             X       
                                
[email protected]    X                                                       X       
                                
[email protected]      X                                                               
                                
[email protected]                                                           X       
                        X       
[email protected]    X                                                       X       
                                
[email protected]                                                               
X                                       
[email protected]                                                              X       
                                
[email protected]      X                                                       
X                                       
[email protected]       X                                                       
X                                       
[email protected] X                                                               
                                
[email protected]    X                                                       
                                        
[email protected]  X                                       
                                                        
[email protected]  X                                       
                                                        
[email protected]   X                                               
                                                
[email protected]     X                                               
                                                
[email protected]   X                                               
                                                
[email protected]      X                                               
                                                
[email protected]    X                                                       
X                                       
[email protected]     X                                                       
X                                       
[email protected]        X                                               
        X                                       
[email protected] X                                                       
X                                       
[email protected]        X                                               
        X                                       
[email protected]      X                                                       
X                                       
[email protected] X                                                       
X                                       
[email protected]     X                                               
        X                                       
[email protected]                                                            
                        X               
[email protected]    X                                                       
X                                       
[email protected]                                                               
X                                       
[email protected]   X                                                       X       
                                
[email protected]    X                                               X       X       
                                
[email protected]                                                           
X                                       
[email protected]    X                                                       
X                                       
[email protected] X                                                       X       
                                
[email protected]    X                                                       
X                                       
[email protected]   X       X                                               X       
                                
[email protected] X                                       X               X       
                                
[email protected]      X                                       X       
        X                                       
[email protected]        X                                               
        X                                       
[email protected] X                                               
        X                                       
[email protected] X                                       
                X                                       
[email protected]                                         X               
                                        
[email protected]     X                                                       
X                                       
[email protected]                                                                
X                               X       
[email protected]                                                                
X                                       
[email protected]       X                                                       
X                                       
[email protected]       X                                               
        X                                       
[email protected]  X                                               
        X                                       
[email protected]  X                                                       X       
                                
[email protected]  X                                                       X       
                                
[email protected]     X                                                       
X                                       
[email protected]   X                                                       
X                                       
[email protected]     X                                                       
X                                       
[email protected]    X                                                       X       
                                
[email protected]    X                                                       X       
                                
[email protected]       X                                                       
X                                       
[email protected] X                                                       X       
                                
[email protected]                                                            X       
                                
[email protected]        X                                                       
X                                       
[email protected]  X                                                       X       
                                
[email protected]       X                                               
        X                                       
[email protected]                   X                                               
                                
[email protected]    X                                                       X       
                                
[email protected]     X                                                       
                                        
[email protected]                                                            
X                                       
[email protected]       X                                                       
X                                       
[email protected]  X                                                       
X                                       
[email protected]                                                                  
                X               
[email protected]                                                           X       
                                
[email protected]                                                             
X                                       
[email protected]    X                                                       
X                                       
[email protected]                                                              
X                                       
[email protected]                                                            X       
                                
[email protected]                                                              
X                                       
[email protected]                                                              
X                                       
[email protected]                                                            
X                                       
[email protected]                                                         X       
                                
[email protected]                                                            
X                                       
[email protected]                                                         X       
                                
[email protected] X                                                       X       
                                
[email protected]  X                                                       X       
                                
[email protected]   X                                                       
X                       X               
[email protected]                                                X               
                                        
[email protected]      X                                                       X       
                                
[email protected]        X                                                       
X                                       
[email protected]    X                                                       X       
                                
[email protected]    X                                                       
X                                       
[email protected]                                                          X       
                        X       
[email protected]                                                             X       
                                
[email protected]+wasi-snapshot-preview1     X       X                               
                X                                       
[email protected]   X                                                       
X                                       
[email protected]    X                                               
        X                                       
[email protected]     X                                               
        X                                       
[email protected]     X                                       
                X                                       
[email protected]    X                                               
        X                                       
[email protected]     X                                                       
X                                       
[email protected]        X                                                       
X                                       
[email protected] X                                                       X       
                                
[email protected]                                        X               
                                                
[email protected]                                                             
X                               X       
[email protected] X                                                       X       
                                
[email protected]      X                                               
        X                                       
[email protected]    X                                                       
X                                       
[email protected]   X                                                       
X                                       
[email protected]       X                                               
        X                                       
[email protected]       X                                               
        X                                       
[email protected]     X                                                       
X                                       
[email protected] X                                                       
X                                       
[email protected]   X                                                       
X                                       
[email protected]  X                                                       
X                                       
[email protected]     X                                                       
X                                       
[email protected]        X                                               
        X                                       
[email protected]                                                                
                        X               
[email protected]    X                                                       X       
                                
[email protected]                                                              X       
                                
[email protected]                                                           X       
                                
[email protected]                                                         X       
                                
[email protected]                                                                     
                X               
[email protected]                                                              
                        X               
[email protected]                                                                 
                X               
[email protected]                                                          
                        X               
[email protected]  X                                                       X       
                                
[email protected]                                                                 
                X               
[email protected]                                                                 
                X               
[email protected]                                                          
                        X               
[email protected]                                                            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
[email protected]  X                       X                               
[email protected]        X                       X               
                
[email protected] X                       X                               
[email protected]  X                       X                               
[email protected]  X                       X                               
[email protected]        X                       X                               
[email protected]    X                       X                               
[email protected]    X                       X                               
[email protected] X                       X                               
[email protected]                           X                               
[email protected]      X                       X                               
[email protected]   X                       X                               
[email protected]  X                       X                               
[email protected]       X                       X                               
[email protected]      X                       X                       
        
[email protected]     X                       X                               
[email protected]    X                       X                               
[email protected]    X                       X                               
[email protected]      X                                                       
[email protected]     X                                               
        
[email protected]     X                       X                               
[email protected]  X                       X                               
[email protected]  X                       X                               
[email protected]       X                       X                               
[email protected]       X                       X                               
[email protected]       X                       X                               
[email protected]   X                       X                               
[email protected]  X                       X                               
[email protected]                                                         X
[email protected]  X                       X                               
[email protected] X                       X                               
[email protected] X                       X                               
[email protected]    X                       X                               
[email protected]        X                       X                       
        
[email protected]      X                       X                               
[email protected]   X                       X                               
[email protected]    X                       X                               
[email protected]    X                       X                               
[email protected]    X                       X                               
[email protected]                           X                               
[email protected]        X                       X                               
[email protected]       X                       X                               
[email protected]                          X                               
[email protected]                             X                               
[email protected]       X                       X       X                       
[email protected]     X                       X                               
[email protected]                                X                               
[email protected]                           X                               
[email protected] X                       X                               
[email protected]    X                       X                               
[email protected]  X                       X                               
[email protected]     X                       X                       
        
[email protected]                                          X               
[email protected]                                          X               
[email protected]                                           X               
[email protected]                                              X       
        
[email protected]                                           X               
[email protected]                                              X       
        
[email protected]                                             X               
[email protected]     X                       X                               
[email protected]     X                       X                               
[email protected]    X                       X                               
[email protected]                            X                       X       
[email protected]                                X                       X       
[email protected]                               X                       
X       
[email protected]       X                       X                               
[email protected] X                       X                               
[email protected]   X                       X                               
[email protected]   X       X               X                               
[email protected]                                          X               
[email protected]        X                       X                               
[email protected]     X                       X                               
[email protected]                             X                               
[email protected]    X                       X                               
[email protected]      X                                                       
[email protected]                           X                       X       
[email protected]    X                       X                               
[email protected]                               X                               
[email protected]                              X                               
[email protected]      X                       X                               
[email protected]       X                       X                               
[email protected]    X                                                       
[email protected]     X                       X                               
[email protected]        X                       X                       
        
[email protected] X                       X                               
[email protected]        X                       X                       
        
[email protected] X                       X                               
[email protected]     X                       X                       
        
[email protected]                                            X               
[email protected]    X                       X                               
[email protected]                               X                               
[email protected]   X                       X                               
[email protected]    X               X       X                               
[email protected]                           X                               
[email protected]    X                       X                               
[email protected]   X       X               X                               
[email protected]     X                       X                               
[email protected]       X                       X                               
[email protected]  X                       X                               
[email protected]     X                       X                               
[email protected]   X                       X                               
[email protected]     X                       X                               
[email protected]    X                       X                               
[email protected]    X                       X                               
[email protected]                            X                               
[email protected]        X                       X                               
[email protected]  X                       X                               
[email protected]       X                       X                       
        
[email protected]    X                       X                               
[email protected]                            X                               
[email protected]                                          X               
[email protected]                           X                               
[email protected]                             X                               
[email protected] X                       X                               
[email protected]  X                       X                               
[email protected]   X                       X               X               
[email protected]      X                       X                               
[email protected]        X                       X                               
[email protected]    X                       X                               
[email protected]    X                       X                               
[email protected]+wasi-snapshot-preview1     X       X               X               
                
[email protected]   X                       X                               
[email protected]     X                       X                       
        
[email protected]     X                       X               
                
[email protected]    X                       X                       
        
[email protected] X                       X                               
[email protected] X                       X                               
[email protected]      X                       X                       
        
[email protected]    X                       X                               
[email protected]   X                       X                               
[email protected]       X                       X                       
        
[email protected]       X                       X                       
        
[email protected]     X                       X                               
[email protected] X                       X                               
[email protected]   X                       X                               
[email protected]  X                       X                               
[email protected]     X                       X                               
[email protected]        X                       X                       
        
[email protected]                                                X               
[email protected]                              X                               
[email protected]                           X                               
[email protected]                         X                               
[email protected]                                             X               
[email protected]                                              X               
[email protected]                                         X               
[email protected]                                          X               
[email protected]                                         X               
[email protected]                                         X               
[email protected]                                          X               
[email protected]                            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,
     }
 }

Reply via email to