From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Lukas Wagner <l.wagner@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] applied: [PATCH pxar 1/1] derive PartialEq trait for Metadata and related structs
Date: Thu, 27 Oct 2022 15:38:10 +0200 [thread overview]
Message-ID: <20221027133810.4kxotqejevagdxng@casey.proxmox.com> (raw)
In-Reply-To: <20221027122806.79851-2-l.wagner@proxmox.com>
applied, thanks
On Thu, Oct 27, 2022 at 02:28:05PM +0200, Lukas Wagner wrote:
> This change is needed in order to compare a file's metadata
> in the coming proxmox-backup-debug diff tool.
>
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> ---
> src/format/acl.rs | 4 ++--
> src/format/mod.rs | 8 ++++----
> src/lib.rs | 8 ++++----
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/src/format/acl.rs b/src/format/acl.rs
> index 510e0bc..640f7e6 100644
> --- a/src/format/acl.rs
> +++ b/src/format/acl.rs
> @@ -96,8 +96,8 @@ pub struct GroupObject {
> pub permissions: Permissions,
> }
>
> -#[derive(Clone, Debug, Endian)]
> -#[cfg_attr(feature = "test-harness", derive(Eq, PartialEq))]
> +#[derive(Clone, Debug, Endian, PartialEq)]
> +#[cfg_attr(feature = "test-harness", derive(Eq))]
> #[repr(C)]
> pub struct Default {
> pub user_obj_permissions: Permissions,
> diff --git a/src/format/mod.rs b/src/format/mod.rs
> index 3224a49..742e126 100644
> --- a/src/format/mod.rs
> +++ b/src/format/mod.rs
> @@ -371,8 +371,8 @@ impl From<Stat_V1> for Stat {
> }
> }
>
> -#[derive(Clone, Debug, Default, Endian)]
> -#[cfg_attr(feature = "test-harness", derive(Eq, PartialEq))]
> +#[derive(Clone, Debug, Default, Endian, PartialEq)]
> +#[cfg_attr(feature = "test-harness", derive(Eq))]
> #[repr(C)]
> pub struct Stat {
> pub mode: u64,
> @@ -679,8 +679,8 @@ fn test_linux_devices() {
> assert_eq!(dev.to_dev_t(), c_dev);
> }
>
> -#[derive(Clone, Debug)]
> -#[cfg_attr(feature = "test-harness", derive(Eq, PartialEq))]
> +#[derive(Clone, Debug, PartialEq)]
> +#[cfg_attr(feature = "test-harness", derive(Eq))]
> #[repr(C)]
> pub struct FCaps {
> pub data: Vec<u8>,
> diff --git a/src/lib.rs b/src/lib.rs
> index c22b8da..03f5df5 100644
> --- a/src/lib.rs
> +++ b/src/lib.rs
> @@ -29,8 +29,8 @@ pub use format::{mode, Stat};
> ///
> /// This includes the usual data you'd get from `stat()` as well as ACLs, extended attributes, file
> /// capabilities and more.
> -#[derive(Clone, Debug, Default)]
> -#[cfg_attr(feature = "test-harness", derive(Eq, PartialEq))]
> +#[derive(Clone, Debug, Default, PartialEq)]
> +#[cfg_attr(feature = "test-harness", derive(Eq))]
> pub struct Metadata {
> /// Data typically found in a `stat()` call.
> pub stat: Stat,
> @@ -305,8 +305,8 @@ impl MetadataBuilder {
> /// ACL entries of a pxar archive.
> ///
> /// This contains all the various ACL entry types supported by the pxar archive format.
> -#[derive(Clone, Debug, Default)]
> -#[cfg_attr(feature = "test-harness", derive(Eq, PartialEq))]
> +#[derive(Clone, Debug, Default, PartialEq)]
> +#[cfg_attr(feature = "test-harness", derive(Eq))]
> pub struct Acl {
> /// User ACL list.
> pub users: Vec<format::acl::User>,
> --
> 2.30.2
next prev parent reply other threads:[~2022-10-27 13:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 12:28 [pbs-devel] [PATCH-SERIES proxmox-backup/pxar] fix #3828: proxmox_backup_debug: Introduce `diff archive` subcommand Lukas Wagner
2022-10-27 12:28 ` [pbs-devel] [PATCH pxar 1/1] derive PartialEq trait for Metadata and related structs Lukas Wagner
2022-10-27 13:38 ` Wolfgang Bumiller [this message]
2022-10-27 12:28 ` [pbs-devel] [PATCH proxmox-backup 1/1] fix #3828: proxmox_backup_debug: Introduce `diff archive` subcommand Lukas Wagner
2022-10-27 13:39 ` Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221027133810.4kxotqejevagdxng@casey.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=l.wagner@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox