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

Author: kraxel

uefi/src/proto/network/http.rs

@@ -6,7 +6,6 @@
 //!
 //! See [`Http`].
 
-extern crate alloc;
 use alloc::string::String;
 use alloc::vec;
 use alloc::vec::Vec;
@@ -138,7 +137,7 @@ pub struct HttpHelper {
 
 impl HttpHelper {
     /// Create new HTTP helper instance for the given NIC handle.
-    pub fn new(nic_handle: Handle) -> uefi::Result<HttpHelper> {
+    pub fn new(nic_handle: Handle) -> uefi::Result<Self> {
         let mut binding = unsafe {
             boot::open_protocol::<HttpBinding>(
                 boot::OpenProtocolParams {
@@ -170,7 +169,7 @@ impl HttpHelper {
         }
         debug!("http: protocol ok");
 
-        Ok(HttpHelper {
+        Ok(Self {
             child_handle,
             binding,
             protocol: Some(protocol_res.unwrap()),
@@ -215,12 +214,12 @@ impl HttpHelper {
 
         let mut tx_req = HttpRequestData {
             method,
-            url: url16.as_ptr() as *const u16,
+            url: url16.as_ptr().cast::<u16>(),
         };
 
         let mut tx_hdr = Vec::new();
         tx_hdr.push(HttpHeader {
-            field_name: c"Host".as_ptr() as *const u8,
+            field_name: c"Host".as_ptr().cast::<u8>(),
             field_value: c_hostname.as_ptr(),
         });
 
@@ -231,7 +230,7 @@ impl HttpHelper {
         if body.is_some() {
             let b = body.unwrap();
             tx_msg.body_length = b.len();
-            tx_msg.body = b.as_mut_ptr() as *mut c_void;
+            tx_msg.body = b.as_mut_ptr().cast::<c_void>();
         }
 
         let mut tx_token = HttpToken {
@@ -319,8 +318,8 @@ impl HttpHelper {
             let n;
             let v;
             unsafe {
-                n = CStr::from_ptr((*rx_msg.header.add(i)).field_name as *const c_char);
-                v = CStr::from_ptr((*rx_msg.header.add(i)).field_value as *const c_char);
+                n = CStr::from_ptr((*rx_msg.header.add(i)).field_name.cast::<c_char>());
+                v = CStr::from_ptr((*rx_msg.header.add(i)).field_value.cast::<c_char>());
             }
             headers.push((
                 n.to_str().unwrap().to_lowercase(),
@@ -343,7 +342,7 @@ impl HttpHelper {
         let mut body = vec![0; 16 * 1024];
         let mut rx_msg = HttpMessage {
             body_length: body.len(),
-            body: body.as_mut_ptr() as *mut c_void,
+            body: body.as_mut_ptr().cast::<c_void>(),
             ..Default::default()
         };