Upgrade vulkano to 0.33.0 am: cfa3173d1d am: 6fb41c608d am: 570756a047

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vulkano/+/2690275

Change-Id: I38453cf4f0693595510a7880ea27fe4a8c26ba00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 2 insertions, 11 deletions

diff --git a/src/descriptor_set/collection.rs b/src/descriptor_set/collection.rs
index d62c15a..77eb4fa 100644
--- a/src/descriptor_set/collection.rs
+++ b/src/descriptor_set/collection.rs
@@ -25,7 +25,6 @@ unsafe impl<T> DescriptorSetsCollection for T
 where
     T: Into<DescriptorSetWithOffsets>,
 {
-    #[inline]
     fn into_vec(self) -> Vec<DescriptorSetWithOffsets> {
         vec![self.into()]
     }
@@ -35,7 +34,6 @@ unsafe impl<T> DescriptorSetsCollection for Vec<T>
 where
     T: Into<DescriptorSetWithOffsets>,
 {
-    #[inline]
     fn into_vec(self) -> Vec<DescriptorSetWithOffsets> {
         self.into_iter().map(|x| x.into()).collect()
     }
@@ -48,17 +46,10 @@ macro_rules! impl_collection {
                   $(, $others: Into<DescriptorSetWithOffsets>)*
         {
             #[inline]
+            #[allow(non_snake_case)]
             fn into_vec(self) -> Vec<DescriptorSetWithOffsets> {
-                #![allow(non_snake_case)]
-
                 let ($first, $($others,)*) = self;
-
-                let mut list = Vec::new();
-                list.push($first.into());
-                $(
-                    list.push($others.into());
-                )+
-                list
+                vec![$first.into() $(, $others.into())+]
             }
         }