uefi/src/proto/network/ip4config2.rs: misc

Author: kraxel

uefi/src/proto/network/ip4config2.rs

@@ -4,7 +4,6 @@
 
 //! IP4 Config2 Protocol.
 
-extern crate alloc;
 use alloc::vec;
 use alloc::vec::Vec;
 use core::ffi::c_void;
@@ -27,10 +26,10 @@ pub struct Ip4Config2(pub Ip4Config2Protocol);
 
 impl Ip4Config2 {
     /// Open IP4 Config2 protocol for the given NIC handle.
-    pub fn new(nic_handle: Handle) -> uefi::Result<ScopedProtocol<Ip4Config2>> {
+    pub fn new(nic_handle: Handle) -> uefi::Result<ScopedProtocol<Self>> {
         let protocol;
         unsafe {
-            protocol = boot::open_protocol::<Ip4Config2>(
+            protocol = boot::open_protocol::<Self>(
                 boot::OpenProtocolParams {
                     handle: nic_handle,
                     agent: boot::image_handle(),
@@ -45,7 +44,7 @@ impl Ip4Config2 {
     /// Set configuration data.  It is recommended to type-specific set_* helpers instead of calling this directly.
     pub fn set_data(&mut self, data_type: Ip4Config2DataType, data: &mut [u8]) -> uefi::Result<()> {
         let status = unsafe {
-            let data_ptr = data.as_mut_ptr() as *mut c_void;
+            let data_ptr = data.as_mut_ptr().cast::<c_void>();
             (self.0.set_data)(&mut self.0, data_type, data.len(), data_ptr)
         };
         match status {
@@ -70,7 +69,7 @@ impl Ip4Config2 {
         // call #2: get data
         let mut data = vec![0; data_size];
         let status = unsafe {
-            let data_ptr = data.as_mut_ptr() as *mut c_void;
+            let data_ptr = data.as_mut_ptr().cast::<c_void>();
             (self.0.get_data)(&mut self.0, data_type, &mut data_size, data_ptr)
         };
         match status {
@@ -89,7 +88,7 @@ impl Ip4Config2 {
     pub fn get_interface_info(&mut self) -> uefi::Result<Ip4Config2InterfaceInfo> {
         let data = self.get_data(Ip4Config2DataType::INTERFACE_INFO)?;
         let info: &Ip4Config2InterfaceInfo =
-            unsafe { &*(data.as_ptr() as *const Ip4Config2InterfaceInfo) };
+            unsafe { &*(data.as_ptr().cast::<Ip4Config2InterfaceInfo>()) };
         Ok(Ip4Config2InterfaceInfo {
             name: info.name,
             if_type: info.if_type,
@@ -124,7 +123,7 @@ impl Ip4Config2 {
         if info.station_addr != no_address {
             if verbose {
                 print!("Network is already up: ");
-                Ip4Config2::print_info(&info);
+                Self::print_info(&info);
             }
             return Ok(());
         }
@@ -143,7 +142,7 @@ impl Ip4Config2 {
             if info.station_addr != no_address {
                 if verbose {
                     print!(" OK: ");
-                    Ip4Config2::print_info(&info);
+                    Self::print_info(&info);
                 }
                 return Ok(());
             }