Merging upstream version 1.71.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 2 insertions, 2 deletions

diff --git a/vendor/gix-config-value/src/color.rs b/vendor/gix-config-value/src/color.rs
index 74e0dd4ac..606eef079 100644
--- a/vendor/gix-config-value/src/color.rs
+++ b/vendor/gix-config-value/src/color.rs
@@ -235,7 +235,7 @@ bitflags::bitflags! {
     /// `gix-config` supports modifiers and their negators. The negating color
     /// attributes are equivalent to having a `no` or `no-` prefix to the normal
     /// variant.
-    #[derive(Default)]
+    #[derive(Default, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
     pub struct Attribute: u32 {
         const BOLD = 1 << 1;
         const DIM = 1 << 2;
diff --git a/vendor/gix-config-value/src/path.rs b/vendor/gix-config-value/src/path.rs
index 99ee5cf2e..58b5970ee 100644
--- a/vendor/gix-config-value/src/path.rs
+++ b/vendor/gix-config-value/src/path.rs
@@ -108,7 +108,7 @@ impl<'a> Path<'a> {
     ///
     /// If this path starts with `~/` or `~user/` or `%(prefix)/`
     ///  - `~/` is expanded to the value of `home_dir`. The caller can use the [dirs](https://crates.io/crates/dirs) crate to obtain it.
-    ///    It it is required but not set, an error is produced.
+    ///    If it is required but not set, an error is produced.
     ///  - `~user/` to the specified user’s home directory, e.g `~alice` might get expanded to `/home/alice` on linux, but requires
     ///    the `home_for_user` function to be provided.
     ///    The interpolation uses `getpwnam` sys call and is therefore not available on windows.