1 files changed, 11 insertions, 16 deletions

diff --git a/src/dhcp.rs b/src/dhcp.rs
index 51680d1..47bae1e 100644
--- a/src/dhcp.rs
+++ b/src/dhcp.rs
@@ -9,10 +9,10 @@ use crate::wire;
 const MAGIC_COOKIE: [u8; 4] = [0x63, 0x82, 0x53, 0x63];
 const FLAG_BROADCAST: u16 = 1 << 15;
 
-pub const VENDOR_CLASS_PXE_CLIENT: &'static [u8] = b"PXEClient";
-pub const VENDOR_CLASS_PXE_SERVER: &'static [u8] = b"PXEServer";
+pub const VENDOR_CLASS_PXE_CLIENT: &[u8] = b"PXEClient";
+pub const VENDOR_CLASS_PXE_SERVER: &[u8] = b"PXEServer";
 
-pub const USER_CLASS_IPXE: &'static [u8] = b"iPXE";
+pub const USER_CLASS_IPXE: &[u8] = b"iPXE";
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum BootOp {
@@ -248,8 +248,8 @@ pub enum PxeClassIdentifierKind {
 }
 
 impl PxeClassIdentifierKind {
-    pub const KIND_CLIENT: &'static str = "PXEClient";
-    pub const KIND_SERVER: &'static str = "PXEServer";
+    pub const KIND_CLIENT: &str = "PXEClient";
+    pub const KIND_SERVER: &str = "PXEServer";
 }
 
 impl FromStr for PxeClassIdentifierKind {
@@ -555,11 +555,6 @@ fn read_len8_prefixed_vec(cursor: &mut Cursor<&[u8]>) -> Result<Vec<u8>> {
     Ok(buf)
 }
 
-fn read_len8_prefixed_string(cursor: &mut Cursor<&[u8]>) -> Result<String> {
-    let buf = read_len8_prefixed_vec(cursor)?;
-    Ok(String::from_utf8(buf).unwrap())
-}
-
 fn read_ipv4(cursor: &mut Cursor<&[u8]>) -> Result<Ipv4Addr> {
     Ok(Ipv4Addr::from_octets(read_arr(cursor)?))
 }
@@ -726,23 +721,23 @@ pub fn write_option<W: Write>(mut writer: W, option: &DhcpOption) -> Result<()>
             wire::write_ipv4(&mut writer, *ip)?;
         }
         DhcpOption::VendorClassIdentifier(vendor_class) => {
-            write_option_len_prefixed_buf(&mut writer, &vendor_class)?
+            write_option_len_prefixed_buf(&mut writer, vendor_class)?
         }
-        DhcpOption::TftpServerName(name) => write_option_len_prefixed_string(&mut writer, &name)?,
-        DhcpOption::TftpFileName(name) => write_option_len_prefixed_string(&mut writer, &name)?,
+        DhcpOption::TftpServerName(name) => write_option_len_prefixed_string(&mut writer, name)?,
+        DhcpOption::TftpFileName(name) => write_option_len_prefixed_string(&mut writer, name)?,
         DhcpOption::UserClassInformation(user_class) => {
-            write_option_len_prefixed_buf(&mut writer, &user_class)?
+            write_option_len_prefixed_buf(&mut writer, user_class)?
         }
         DhcpOption::ClientSystemArchitecture(arch) => {
             wire::write_u8(&mut writer, 2)?;
             wire::write_u16(&mut writer, u16::from(*arch))?;
         }
         DhcpOption::ClientMachineIdentifier(identifier) => {
-            write_option_len_prefixed_buf(&mut writer, &identifier)?
+            write_option_len_prefixed_buf(&mut writer, identifier)?
         }
         DhcpOption::Unknown { data, .. } => {
             wire::write_u8(&mut writer, u8::try_from(data.len()).unwrap())?;
-            wire::write(&mut writer, &data)?;
+            wire::write(&mut writer, data)?;
         }
     }
     Ok(())