From b905279ce0257509f5350723904b20612e7a510d Mon Sep 17 00:00:00 2001
From: Kenny Kerr <kenny@kennykerr.ca>
Date: Thu, 14 Dec 2023 08:29:52 -0600
Subject: [PATCH] bindgen

---
 .../impl/Foundation/Collections/Iterable.rs   | 10 +++---
 .../impl/Foundation/Collections/MapView.rs    | 32 +++++++++----------
 .../impl/Foundation/Collections/VectorView.rs | 12 +++----
 crates/libs/bindgen/src/rust/writer.rs        |  4 +--
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/Iterable.rs b/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/Iterable.rs
index f004131c94..80533532bf 100644
--- a/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/Iterable.rs
+++ b/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/Iterable.rs
@@ -2,7 +2,7 @@
 struct StockIterable<T>
 where
     T: ::windows_core::RuntimeType + 'static,
-    <T as ::windows_core::Type<T>>::Default: Clone,
+    T::Default: Clone,
 {
     values: Vec<T::Default>,
 }
@@ -10,7 +10,7 @@ where
 impl<T> IIterable_Impl<T> for StockIterable<T>
 where
     T: ::windows_core::RuntimeType,
-    <T as ::windows_core::Type<T>>::Default: Clone,
+    T::Default: Clone,
 {
     fn First(&self) -> ::windows_core::Result<IIterator<T>> {
         unsafe {
@@ -29,7 +29,7 @@ where
 struct StockIterator<T>
 where
     T: ::windows_core::RuntimeType + 'static,
-    <T as ::windows_core::Type<T>>::Default: Clone,
+    T::Default: Clone,
 {
     owner: IIterable<T>,
     current: ::std::sync::atomic::AtomicUsize,
@@ -38,7 +38,7 @@ where
 impl<T> IIterator_Impl<T> for StockIterator<T>
 where
     T: ::windows_core::RuntimeType,
-    <T as ::windows_core::Type<T>>::Default: Clone,
+    T::Default: Clone,
 {
     fn Current(&self) -> ::windows_core::Result<T> {
         let owner: &StockIterable<T> = unsafe { ::windows_core::AsImpl::as_impl(&self.owner) };
@@ -86,7 +86,7 @@ where
 impl<T> ::core::convert::TryFrom<Vec<T::Default>> for IIterable<T>
 where
     T: ::windows_core::RuntimeType,
-    <T as ::windows_core::Type<T>>::Default: Clone,
+    T::Default: Clone,
 {
     type Error = ::windows_core::Error;
     fn try_from(values: Vec<T::Default>) -> ::windows_core::Result<Self> {
diff --git a/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/MapView.rs b/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/MapView.rs
index ec11504d54..7e82135442 100644
--- a/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/MapView.rs
+++ b/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/MapView.rs
@@ -3,8 +3,8 @@ struct StockMapView<K, V>
 where
     K: ::windows_core::RuntimeType + 'static,
     V: ::windows_core::RuntimeType + 'static,
-    <K as ::windows_core::Type<K>>::Default: Clone + Ord,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone + Ord,
+    V::Default: Clone,
 {
     map: std::collections::BTreeMap<K::Default, V::Default>,
 }
@@ -13,8 +13,8 @@ impl<K, V> IIterable_Impl<IKeyValuePair<K, V>> for StockMapView<K, V>
 where
     K: ::windows_core::RuntimeType,
     V: ::windows_core::RuntimeType,
-    <K as ::windows_core::Type<K>>::Default: Clone + Ord,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone + Ord,
+    V::Default: Clone,
 {
     fn First(&self) -> ::windows_core::Result<IIterator<IKeyValuePair<K, V>>> {
         unsafe {
@@ -33,8 +33,8 @@ impl<K, V> IMapView_Impl<K, V> for StockMapView<K, V>
 where
     K: ::windows_core::RuntimeType,
     V: ::windows_core::RuntimeType,
-    <K as ::windows_core::Type<K>>::Default: Clone + Ord,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone + Ord,
+    V::Default: Clone,
 {
     fn Lookup(&self, key: &K::Default) -> ::windows_core::Result<V> {
         let value = self
@@ -65,8 +65,8 @@ struct StockMapViewIterator<'a, K, V>
 where
     K: ::windows_core::RuntimeType + 'static,
     V: ::windows_core::RuntimeType + 'static,
-    <K as ::windows_core::Type<K>>::Default: Clone + Ord,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone + Ord,
+    V::Default: Clone,
 {
     _owner: IIterable<IKeyValuePair<K, V>>,
     current: ::std::sync::RwLock<std::collections::btree_map::Iter<'a, K::Default, V::Default>>,
@@ -76,8 +76,8 @@ impl<'a, K, V> IIterator_Impl<IKeyValuePair<K, V>> for StockMapViewIterator<'a,
 where
     K: ::windows_core::RuntimeType,
     V: ::windows_core::RuntimeType,
-    <K as ::windows_core::Type<K>>::Default: Clone + Ord,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone + Ord,
+    V::Default: Clone,
 {
     fn Current(&self) -> ::windows_core::Result<IKeyValuePair<K, V>> {
         let mut current = self.current.read().unwrap().clone().peekable();
@@ -134,8 +134,8 @@ struct StockKeyValuePair<K, V>
 where
     K: ::windows_core::RuntimeType + 'static,
     V: ::windows_core::RuntimeType + 'static,
-    <K as ::windows_core::Type<K>>::Default: Clone,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone,
+    V::Default: Clone,
 {
     key: K::Default,
     value: V::Default,
@@ -145,8 +145,8 @@ impl<K, V> IKeyValuePair_Impl<K, V> for StockKeyValuePair<K, V>
 where
     K: ::windows_core::RuntimeType,
     V: ::windows_core::RuntimeType,
-    <K as ::windows_core::Type<K>>::Default: Clone,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone,
+    V::Default: Clone,
 {
     fn Key(&self) -> ::windows_core::Result<K> {
         K::from_default(&self.key)
@@ -161,8 +161,8 @@ impl<K, V> ::core::convert::TryFrom<std::collections::BTreeMap<K::Default, V::De
 where
     K: ::windows_core::RuntimeType,
     V: ::windows_core::RuntimeType,
-    <K as ::windows_core::Type<K>>::Default: Clone + Ord,
-    <V as ::windows_core::Type<V>>::Default: Clone,
+    K::Default: Clone + Ord,
+    V::Default: Clone,
 {
     type Error = ::windows_core::Error;
     fn try_from(
diff --git a/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/VectorView.rs b/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/VectorView.rs
index f247cc16b2..279b62d7fe 100644
--- a/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/VectorView.rs
+++ b/crates/libs/bindgen/src/rust/extensions/impl/Foundation/Collections/VectorView.rs
@@ -2,7 +2,7 @@
 struct StockVectorView<T>
 where
     T: ::windows_core::RuntimeType + 'static,
-    <T as ::windows_core::Type<T>>::Default: Clone + PartialEq,
+    T::Default: Clone + PartialEq,
 {
     values: Vec<T::Default>,
 }
@@ -10,7 +10,7 @@ where
 impl<T> IIterable_Impl<T> for StockVectorView<T>
 where
     T: ::windows_core::RuntimeType,
-    <T as ::windows_core::Type<T>>::Default: Clone + PartialEq,
+    T::Default: Clone + PartialEq,
 {
     fn First(&self) -> ::windows_core::Result<IIterator<T>> {
         unsafe {
@@ -28,7 +28,7 @@ where
 impl<T> IVectorView_Impl<T> for StockVectorView<T>
 where
     T: ::windows_core::RuntimeType,
-    <T as ::windows_core::Type<T>>::Default: Clone + PartialEq,
+    T::Default: Clone + PartialEq,
 {
     fn GetAt(&self, index: u32) -> ::windows_core::Result<T> {
         let item = self
@@ -65,7 +65,7 @@ where
 struct StockVectorViewIterator<T>
 where
     T: ::windows_core::RuntimeType + 'static,
-    <T as ::windows_core::Type<T>>::Default: Clone + PartialEq,
+    T::Default: Clone + PartialEq,
 {
     owner: IIterable<T>,
     current: ::std::sync::atomic::AtomicUsize,
@@ -74,7 +74,7 @@ where
 impl<T> IIterator_Impl<T> for StockVectorViewIterator<T>
 where
     T: ::windows_core::RuntimeType,
-    <T as ::windows_core::Type<T>>::Default: Clone + PartialEq,
+    T::Default: Clone + PartialEq,
 {
     fn Current(&self) -> ::windows_core::Result<T> {
         let owner: &StockVectorView<T> = unsafe { ::windows_core::AsImpl::as_impl(&self.owner) };
@@ -122,7 +122,7 @@ where
 impl<T> ::core::convert::TryFrom<Vec<T::Default>> for IVectorView<T>
 where
     T: ::windows_core::RuntimeType,
-    <T as ::windows_core::Type<T>>::Default: Clone + PartialEq,
+    T::Default: Clone + PartialEq,
 {
     type Error = ::windows_core::Error;
     fn try_from(values: Vec<T::Default>) -> ::windows_core::Result<Self> {
diff --git a/crates/libs/bindgen/src/rust/writer.rs b/crates/libs/bindgen/src/rust/writer.rs
index 5e4572efc0..2b1f9e3e39 100644
--- a/crates/libs/bindgen/src/rust/writer.rs
+++ b/crates/libs/bindgen/src/rust/writer.rs
@@ -660,7 +660,7 @@ impl Writer {
                     };
 
                     quote! {
-                        .push_other(<#g as ::windows_core::RuntimeType>::SIGNATURE)
+                        .push_other(#g::SIGNATURE)
                         #semi
                     }
                 });
@@ -900,7 +900,7 @@ impl Writer {
                     quote! { result__ as *mut _ as *mut _, }
                 }
                 metadata::SignatureKind::Query(query) | metadata::SignatureKind::QueryOptional(query) if query.guid == position => {
-                    quote! { &<T as ::windows_core::ComInterface>::IID, }
+                    quote! { &T::IID, }
                 }
                 _ => {
                     let name = self.param_name(param.def);