Merging upstream version 1.76.0+dfsg1.

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

1 files changed, 15 insertions, 9 deletions

diff --git a/vendor/core-foundation/src/lib.rs b/vendor/core-foundation/src/lib.rs
index b93593899..767d45aad 100644
--- a/vendor/core-foundation/src/lib.rs
+++ b/vendor/core-foundation/src/lib.rs
@@ -21,7 +21,7 @@ extern crate libc;
 #[cfg(feature = "with-chrono")]
 extern crate chrono;
 
-use base::TCFType;
+use crate::base::TCFType;
 
 pub unsafe trait ConcreteCFType: TCFType {}
 
@@ -165,7 +165,6 @@ macro_rules! impl_TCFType {
     (@Phantom $x:ident) => { ::std::marker::PhantomData };
 }
 
-
 /// Implement `std::fmt::Debug` for the given type.
 ///
 /// This will invoke the implementation of `Debug` for [`CFType`]
@@ -200,7 +199,14 @@ macro_rules! impl_CFComparison {
             #[inline]
             fn partial_cmp(&self, other: &$ty) -> Option<::std::cmp::Ordering> {
                 unsafe {
-                    Some($compare(self.as_concrete_TypeRef(), other.as_concrete_TypeRef(), ::std::ptr::null_mut()).into())
+                    Some(
+                        $compare(
+                            self.as_concrete_TypeRef(),
+                            other.as_concrete_TypeRef(),
+                            ::std::ptr::null_mut(),
+                        )
+                        .into(),
+                    )
                 }
             }
         }
@@ -211,26 +217,26 @@ macro_rules! impl_CFComparison {
                 self.partial_cmp(other).unwrap()
             }
         }
-    }
+    };
 }
 
 pub mod array;
 pub mod attributed_string;
 pub mod base;
 pub mod boolean;
+pub mod bundle;
 pub mod characterset;
 pub mod data;
 pub mod date;
 pub mod dictionary;
 pub mod error;
 pub mod filedescriptor;
+pub mod mach_port;
 pub mod number;
-pub mod set;
-pub mod string;
-pub mod url;
-pub mod bundle;
 pub mod propertylist;
 pub mod runloop;
+pub mod set;
+pub mod string;
 pub mod timezone;
+pub mod url;
 pub mod uuid;
-pub mod mach_port;