Ensure string library is availble in no_std

hedgetechllc · Nov 4, 2024 · b4954e0 · b4954e0
1 parent 8b78848
commit b4954e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/musicxml/src/lib.rs b/musicxml/src/lib.rs
@@ -116,7 +116,7 @@
 #[macro_use]
 extern crate alloc;
 
-use alloc::string::String;
+use alloc::{string::String, vec::Vec};
 
 /// Contains the main data types used by the MusicXML format.
 ///

diff --git a/musicxml/src/parser/mod.rs b/musicxml/src/parser/mod.rs
@@ -45,7 +45,7 @@ fn get_musicxml_contents(data: Vec<u8>) -> Result<String, String> {
       Err(String::from("Cannot find MusicXML file in compressed archive"))?;
     }
   } else {
-    contents = String::from_utf8(data).map_err(|e| e.to_string())?;
+    contents = String::from_utf8(data).or_else(|_| Err(String::from("Invalid UTF-8 data in MusicXML content")))?;
   }
   Ok(contents)
 }