From 2c274ac5996363bc99d8be3469429e6fdabbba59 Mon Sep 17 00:00:00 2001 From: Facundo Poblete Date: Wed, 22 Jan 2025 14:59:34 -0300 Subject: [PATCH] PR comments --- mirrord/intproxy/src/proxies/files.rs | 8 ++++---- mirrord/protocol/src/codec.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mirrord/intproxy/src/proxies/files.rs b/mirrord/intproxy/src/proxies/files.rs index b4975754676..55c1b2f98f0 100644 --- a/mirrord/intproxy/src/proxies/files.rs +++ b/mirrord/intproxy/src/proxies/files.rs @@ -259,24 +259,24 @@ impl FilesProxy { match request { FileRequest::ReadLink(..) - if protocol_version.is_some_and(|version| !READLINK_VERSION.matches(version)) => + if protocol_version.is_none_or(|version| !READLINK_VERSION.matches(version)) => { Err(FileResponse::ReadLink(Err(ResponseError::NotImplemented))) } FileRequest::MakeDir(..) | FileRequest::MakeDirAt(..) - if protocol_version.is_some_and(|version| !MKDIR_VERSION.matches(version)) => + if protocol_version.is_none_or(|version| !MKDIR_VERSION.matches(version)) => { Err(FileResponse::MakeDir(Err(ResponseError::NotImplemented))) } FileRequest::RemoveDir(..) | FileRequest::Unlink(..) | FileRequest::UnlinkAt(..) if protocol_version - .is_some_and(|version: &Version| !RMDIR_VERSION.matches(version)) => + .is_none_or(|version: &Version| !RMDIR_VERSION.matches(version)) => { Err(FileResponse::RemoveDir(Err(ResponseError::NotImplemented))) } FileRequest::StatFs(..) if protocol_version - .is_some_and(|version: &Version| !STATFS_VERSION.matches(version)) => + .is_none_or(|version: &Version| !STATFS_VERSION.matches(version)) => { Err(FileResponse::XstatFs(Err(ResponseError::NotImplemented))) } diff --git a/mirrord/protocol/src/codec.rs b/mirrord/protocol/src/codec.rs index b91c67e4d37..9c25ef004bd 100644 --- a/mirrord/protocol/src/codec.rs +++ b/mirrord/protocol/src/codec.rs @@ -77,7 +77,6 @@ pub enum FileRequest { Access(AccessFileRequest), Xstat(XstatRequest), XstatFs(XstatFsRequest), - StatFs(StatFsRequest), FdOpenDir(FdOpenDirRequest), ReadDir(ReadDirRequest), CloseDir(CloseDirRequest), @@ -95,6 +94,7 @@ pub enum FileRequest { RemoveDir(RemoveDirRequest), Unlink(UnlinkRequest), UnlinkAt(UnlinkAtRequest), + StatFs(StatFsRequest), } /// Minimal mirrord-protocol version that allows `ClientMessage::ReadyForLogs` message.