deprecate oplist::version and change use of version to versioned

apache · Dec 30, 2024 · 6be969c · 6be969c
1 parent d67cead
commit 6be969c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/core/src/layers/capability_check.rs b/core/src/layers/capability_check.rs
@@ -131,7 +131,7 @@ impl<A: Access> LayeredAccess for CapabilityAccessor<A> {
 
     async fn list(&self, path: &str, args: OpList) -> crate::Result<(RpList, Self::Lister)> {
         let capability = self.info.full_capability();
-        if !capability.list_with_version && args.version() {
+        if !capability.list_with_version && args.versioned() {
             return Err(new_unsupported_error(
                 self.info.as_ref(),
                 Operation::List,
@@ -191,7 +191,7 @@ impl<A: Access> LayeredAccess for CapabilityAccessor<A> {
         args: OpList,
     ) -> crate::Result<(RpList, Self::BlockingLister)> {
         let capability = self.info.full_capability();
-        if !capability.list_with_version && args.version() {
+        if !capability.list_with_version && args.versioned() {
             return Err(new_unsupported_error(
                 self.info.as_ref(),
                 Operation::BlockingList,
@@ -289,7 +289,7 @@ mod tests {
             list: true,
             ..Default::default()
         });
-        let res = op.list_with("path/").version(true).await;
+        let res = op.list_with("path/").versioned(true).await;
         assert!(res.is_err());
         assert_eq!(res.unwrap_err().kind(), ErrorKind::Unsupported);
 

diff --git a/core/src/raw/ops.rs b/core/src/raw/ops.rs
@@ -190,9 +190,15 @@ impl OpList {
     }
 
     /// Get the version of this list operation
+    #[deprecated = "use versioned instead"]
     pub fn version(&self) -> bool {
         self.version
     }
+
+    /// Get the version of this list operation
+    pub fn versioned(&self) -> bool {
+        self.version
+    }
 }
 
 /// Args for `presign` operation.

diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs
@@ -1060,7 +1060,7 @@ impl Access for S3Backend {
     }
 
     async fn list(&self, path: &str, args: OpList) -> Result<(RpList, Self::Lister)> {
-        let l = if args.version() {
+        let l = if args.versioned() {
             TwoWays::Two(PageLister::new(S3ObjectVersionsLister::new(
                 self.core.clone(),
                 path,