make_boxed: prevent 'explicit_generic_args_with_impl_trait' due to MSRV

Author: phip1611

uefi/src/mem.rs

@@ -16,8 +16,12 @@ use uefi::Error;
 /// - return a mutable typed reference (which points to the same memory as the input buffer) on
 ///   success, and
 /// - return the required buffer size on error.
-pub fn make_boxed<'a, Data: Align + ?Sized + Debug + 'a>(
-    mut fetch_data_fn: impl FnMut(&'a mut [u8]) -> Result<&'a mut Data, Option<usize>>,
+pub fn make_boxed<
+    'a,
+    Data: Align + ?Sized + Debug + 'a,
+    F: FnMut(&'a mut [u8]) -> Result<&'a mut Data, Option<usize>>,
+>(
+    mut fetch_data_fn: F,
 ) -> Result<Box<Data>> {
     let required_size = match fetch_data_fn(&mut []).map_err(Error::split) {
         // This is the expected case: the empty buffer passed in is too

uefi/src/proto/media/file/dir.rs

@@ -77,7 +77,7 @@ impl Directory {
                     maybe_info.expect("Should have more entries")
                 })
         };
-        let file_info = make_boxed::<FileInfo>(fetch_data_fn)?;
+        let file_info = make_boxed::<FileInfo, _>(fetch_data_fn)?;
         Ok(Some(file_info))
     }
 

uefi/src/proto/media/file/mod.rs

@@ -165,7 +165,7 @@ pub trait File: Sized {
     /// Get the dynamically allocated info for a file
     fn get_boxed_info<Info: FileProtocolInfo + ?Sized + Debug>(&mut self) -> Result<Box<Info>> {
         let fetch_data_fn = |buf| self.get_info::<Info>(buf);
-        let file_info = make_boxed::<Info>(fetch_data_fn)?;
+        let file_info = make_boxed::<Info, _>(fetch_data_fn)?;
         Ok(file_info)
     }