replace bytes_to_string function with std function

Author: K-Nicolas-10

tockloader-lib/src/attributes/decode.rs

@@ -70,24 +70,3 @@ pub(crate) fn decode_attribute(step: &[u8]) -> Option<DecodedAttribute> {
     value = value.trim_end_matches('\0').to_string();
     Some(DecodedAttribute::new(key, value))
 }
-
-// TODO(eva-cosma) replace this function with std::str::from_utf8(...). It
-// does the same thing.
-
-/// Transform a byte-slice into a String.
-///
-/// # Panics
-///
-/// This code panics if the given bytes are not utf-8 representable
-pub(crate) fn bytes_to_string(raw: &[u8]) -> String {
-    let decoder = utf8_decode::Decoder::new(raw.iter().cloned());
-
-    let mut string = String::new();
-    for n in decoder {
-        match n {
-            Ok(c) => string.push(c),
-            Err(_) => {}
-        }
-    }
-    string
-}

tockloader-lib/src/attributes/system_attributes.rs

@@ -7,7 +7,7 @@ use byteorder::{ByteOrder, LittleEndian};
 use crate::errors::{AttributeParseError, TockError, TockloaderError};
 use crate::IO;
 
-use super::decode::{bytes_to_string, decode_attribute};
+use super::decode::decode_attribute;
 
 /// This structure contains all relevant information about board that is stored
 /// in the bootloader ROM.
@@ -64,8 +64,8 @@ impl SystemAttributes {
         }
     }
     /// Read system and kernel attributes.
-    ///``
-    ///
+    /// System attributes are read only if the board has
+    /// a bootloader present.
     /// # Parameters
     /// - `conn` : Either a SerialConnection or a ProbeRSConnection.
     /// - `flash_address` : The start of flash memory.
@@ -95,6 +95,7 @@ impl SystemAttributes {
             .unwrap_or(false);
 
         if !has_bootloader {
+            // TODO: Chain: CLI arguments -> hardcoded start_address -> calculate from kernel app start address
             result.appaddr = Some(start_address);
         } else {
             for current_slot in 0..data.len() {
@@ -171,7 +172,9 @@ impl SystemAttributes {
             - 100;
         let kernel_attr_binary = conn.read(kernel_attr_addr, 100).await?;
 
-        let sentinel = bytes_to_string(&kernel_attr_binary[96..100]);
+        let sentinel = std::str::from_utf8(&kernel_attr_binary[96..100])
+            .unwrap_or("unknown")
+            .to_string();
         let kernel_version = LittleEndian::read_uint(&kernel_attr_binary[95..96], 1);
 
         let app_memory_len = LittleEndian::read_u32(&kernel_attr_binary[84..92]);