diff --git a/Cargo.toml b/Cargo.toml index 490d03e..d2b645a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" [workspace.package] edition = "2021" -version = "1.0.6" +version = "1.0.7" authors = ["Will Hedgecock "] license = "MIT" documentation = "https://docs.rs/musicxml/latest/" @@ -16,11 +16,11 @@ categories = ["api-bindings", "encoding", "parsing"] publish = true [workspace.dependencies] -musicxml_internal = { path = "musicxml_internal", version = "1.0.6" } -musicxml_macros = { path = "musicxml_macros", version = "1.0.6" } +musicxml_internal = { path = "musicxml_internal", version = "1.0.7" } +musicxml_macros = { path = "musicxml_macros", version = "1.0.7" } [profile.release] -codegen-units = 4096 +codegen-units = 1 debug = false debug-assertions = false incremental = false diff --git a/README.md b/README.md index 5e06443..fa0f8a3 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,8 @@ details. ## License This library is licensed under the [MIT license](http://opensource.org/licenses/MIT). + + +## TODO + +Add documentation about "std" feature, add options to parse MusicXML files directly from string (both compressed and uncompressed), same for writing to string diff --git a/musicxml/Cargo.toml b/musicxml/Cargo.toml index f5b7f57..49d93f0 100644 --- a/musicxml/Cargo.toml +++ b/musicxml/Cargo.toml @@ -17,10 +17,14 @@ publish.workspace = true rustdoc-args = ["--extend-css", "assets/docs.css"] [dependencies] -regex = { version = "1.10", default-features = false, features = ["std", "perf"] } -zip = { version = "2.1", default-features = false, features = ["deflate"] } +regex = { version = "1.10", default-features = false, features = ["perf"] } +zip = { version = "2.1", default-features = false, features = ["deflate"], optional = true } musicxml_internal.workspace = true musicxml_macros.workspace = true +[features] +default = ["std"] +std = ["zip", "regex/std"] + [lib] crate-type = ["rlib"] diff --git a/musicxml/src/datatypes/above_below.rs b/musicxml/src/datatypes/above_below.rs index 81dba56..f37cacd 100644 --- a/musicxml/src/datatypes/above_below.rs +++ b/musicxml/src/datatypes/above_below.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/accidental_value.rs b/musicxml/src/datatypes/accidental_value.rs index 31a35fc..011123e 100644 --- a/musicxml/src/datatypes/accidental_value.rs +++ b/musicxml/src/datatypes/accidental_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/accordion_middle.rs b/musicxml/src/datatypes/accordion_middle.rs index 155cf66..471426b 100644 --- a/musicxml/src/datatypes/accordion_middle.rs +++ b/musicxml/src/datatypes/accordion_middle.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// May have values of 1, 2, or 3, corresponding to having 1 to 3 dots in the middle section of the accordion registration symbol. /// diff --git a/musicxml/src/datatypes/anyuri.rs b/musicxml/src/datatypes/anyuri.rs index 0ee5299..b6d3d08 100644 --- a/musicxml/src/datatypes/anyuri.rs +++ b/musicxml/src/datatypes/anyuri.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#anyURI). /// diff --git a/musicxml/src/datatypes/arrow_direction.rs b/musicxml/src/datatypes/arrow_direction.rs index 434a185..c4a4061 100644 --- a/musicxml/src/datatypes/arrow_direction.rs +++ b/musicxml/src/datatypes/arrow_direction.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/arrow_style.rs b/musicxml/src/datatypes/arrow_style.rs index 96fc944..2c6467b 100644 --- a/musicxml/src/datatypes/arrow_style.rs +++ b/musicxml/src/datatypes/arrow_style.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/backward_forward.rs b/musicxml/src/datatypes/backward_forward.rs index 927f3e4..8ca8bd7 100644 --- a/musicxml/src/datatypes/backward_forward.rs +++ b/musicxml/src/datatypes/backward_forward.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/bar_style.rs b/musicxml/src/datatypes/bar_style.rs index c2ef778..14ad570 100644 --- a/musicxml/src/datatypes/bar_style.rs +++ b/musicxml/src/datatypes/bar_style.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/beam_level.rs b/musicxml/src/datatypes/beam_level.rs index 583c050..dad68aa 100644 --- a/musicxml/src/datatypes/beam_level.rs +++ b/musicxml/src/datatypes/beam_level.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Supports six levels of beaming, up to 1024th notes. /// diff --git a/musicxml/src/datatypes/beam_value.rs b/musicxml/src/datatypes/beam_value.rs index e3d8a2e..2e5ced3 100644 --- a/musicxml/src/datatypes/beam_value.rs +++ b/musicxml/src/datatypes/beam_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/beater_value.rs b/musicxml/src/datatypes/beater_value.rs index 820ff78..f018638 100644 --- a/musicxml/src/datatypes/beater_value.rs +++ b/musicxml/src/datatypes/beater_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/bend_shape.rs b/musicxml/src/datatypes/bend_shape.rs index 8da74e1..6ec80ba 100644 --- a/musicxml/src/datatypes/bend_shape.rs +++ b/musicxml/src/datatypes/bend_shape.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/breath_mark_value.rs b/musicxml/src/datatypes/breath_mark_value.rs index 4afe131..20daa49 100644 --- a/musicxml/src/datatypes/breath_mark_value.rs +++ b/musicxml/src/datatypes/breath_mark_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/caesura_value.rs b/musicxml/src/datatypes/caesura_value.rs index cf009c5..e4304a1 100644 --- a/musicxml/src/datatypes/caesura_value.rs +++ b/musicxml/src/datatypes/caesura_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Represents the shape of the caesura sign. diff --git a/musicxml/src/datatypes/cancel_location.rs b/musicxml/src/datatypes/cancel_location.rs index 6b7bb41..ada61ce 100644 --- a/musicxml/src/datatypes/cancel_location.rs +++ b/musicxml/src/datatypes/cancel_location.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/circular_arrow.rs b/musicxml/src/datatypes/circular_arrow.rs index a803e55..7ce4619 100644 --- a/musicxml/src/datatypes/circular_arrow.rs +++ b/musicxml/src/datatypes/circular_arrow.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/clef_sign.rs b/musicxml/src/datatypes/clef_sign.rs index 8d4d1fe..854cc98 100644 --- a/musicxml/src/datatypes/clef_sign.rs +++ b/musicxml/src/datatypes/clef_sign.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/color.rs b/musicxml/src/datatypes/color.rs index c68c1d9..e1e2774 100644 --- a/musicxml/src/datatypes/color.rs +++ b/musicxml/src/datatypes/color.rs @@ -1,6 +1,6 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use regex::Regex; -use std::fmt; /// Indicates the color of an element. /// @@ -33,8 +33,8 @@ impl Color { } } -impl fmt::Display for Color { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result { +impl core::fmt::Display for Color { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { write!(f, "aRGB({}, {}, {}, {})", self.a, self.r, self.g, self.b) } } diff --git a/musicxml/src/datatypes/comma_separated_text.rs b/musicxml/src/datatypes/comma_separated_text.rs index f7a88a9..141e26e 100644 --- a/musicxml/src/datatypes/comma_separated_text.rs +++ b/musicxml/src/datatypes/comma_separated_text.rs @@ -1,5 +1,6 @@ +use alloc::{string::String, string::ToString, vec::Vec}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; -use std::ops::Deref; /// Used to specify a comma-separated list of text elements, as is used by the `font_family` attribute. /// diff --git a/musicxml/src/datatypes/css_font_size.rs b/musicxml/src/datatypes/css_font_size.rs index 4df4ced..57858c7 100644 --- a/musicxml/src/datatypes/css_font_size.rs +++ b/musicxml/src/datatypes/css_font_size.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/date.rs b/musicxml/src/datatypes/date.rs index 7153504..d5a7600 100644 --- a/musicxml/src/datatypes/date.rs +++ b/musicxml/src/datatypes/date.rs @@ -1,6 +1,6 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use regex::Regex; -use std::fmt; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#date). #[derive(Debug, PartialEq, Eq)] @@ -30,8 +30,8 @@ impl Date { } } -impl fmt::Display for Date { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result { +impl core::fmt::Display for Date { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { write!( f, "{:04}-{:02}-{:02}{:+03}:{:02}", diff --git a/musicxml/src/datatypes/decimal.rs b/musicxml/src/datatypes/decimal.rs index 37cba03..b7750cb 100644 --- a/musicxml/src/datatypes/decimal.rs +++ b/musicxml/src/datatypes/decimal.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#decimal). /// diff --git a/musicxml/src/datatypes/degree_symbol_value.rs b/musicxml/src/datatypes/degree_symbol_value.rs index 1abfba3..900d53a 100644 --- a/musicxml/src/datatypes/degree_symbol_value.rs +++ b/musicxml/src/datatypes/degree_symbol_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/degree_type_value.rs b/musicxml/src/datatypes/degree_type_value.rs index 70002e7..fcd28ce 100644 --- a/musicxml/src/datatypes/degree_type_value.rs +++ b/musicxml/src/datatypes/degree_type_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/distance_type.rs b/musicxml/src/datatypes/distance_type.rs index 1d9d06b..1984c07 100644 --- a/musicxml/src/datatypes/distance_type.rs +++ b/musicxml/src/datatypes/distance_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Defines what type of distance is being defined in a [Distance][crate::elements::Distance] element. diff --git a/musicxml/src/datatypes/divisions.rs b/musicxml/src/datatypes/divisions.rs index 2961021..367247d 100644 --- a/musicxml/src/datatypes/divisions.rs +++ b/musicxml/src/datatypes/divisions.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// Used to express values in terms of the musical divisions defined by the divisions element. /// diff --git a/musicxml/src/datatypes/effect_value.rs b/musicxml/src/datatypes/effect_value.rs index 6b788c8..989b1a9 100644 --- a/musicxml/src/datatypes/effect_value.rs +++ b/musicxml/src/datatypes/effect_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/enclosure_shape.rs b/musicxml/src/datatypes/enclosure_shape.rs index 327b3aa..bf89132 100644 --- a/musicxml/src/datatypes/enclosure_shape.rs +++ b/musicxml/src/datatypes/enclosure_shape.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/ending_number.rs b/musicxml/src/datatypes/ending_number.rs index 117d2e3..2b1879c 100644 --- a/musicxml/src/datatypes/ending_number.rs +++ b/musicxml/src/datatypes/ending_number.rs @@ -1,7 +1,8 @@ +use alloc::{string::String, string::ToString, vec::Vec}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; use regex::Regex; -use std::ops::Deref; /// Used to specify either a comma-separated list of positive integers without leading zeros, or a string of zero or more spaces. /// diff --git a/musicxml/src/datatypes/fan.rs b/musicxml/src/datatypes/fan.rs index 7e88e5b..874c380 100644 --- a/musicxml/src/datatypes/fan.rs +++ b/musicxml/src/datatypes/fan.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/fermata_shape.rs b/musicxml/src/datatypes/fermata_shape.rs index 2b3674f..d94e947 100644 --- a/musicxml/src/datatypes/fermata_shape.rs +++ b/musicxml/src/datatypes/fermata_shape.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Represents the shape of the fermata sign. diff --git a/musicxml/src/datatypes/fifths.rs b/musicxml/src/datatypes/fifths.rs index 9241453..c49373c 100644 --- a/musicxml/src/datatypes/fifths.rs +++ b/musicxml/src/datatypes/fifths.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Represents the number of flats or sharps in a traditional key signature. /// diff --git a/musicxml/src/datatypes/font_family.rs b/musicxml/src/datatypes/font_family.rs index f61a7e7..c91b401 100644 --- a/musicxml/src/datatypes/font_family.rs +++ b/musicxml/src/datatypes/font_family.rs @@ -1,5 +1,6 @@ +use alloc::{string::String, string::ToString, vec::Vec}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; -use std::ops::Deref; /// Comma-separated list of font names. /// diff --git a/musicxml/src/datatypes/font_size.rs b/musicxml/src/datatypes/font_size.rs index 23bce77..8eba337 100644 --- a/musicxml/src/datatypes/font_size.rs +++ b/musicxml/src/datatypes/font_size.rs @@ -1,4 +1,5 @@ use super::css_font_size::CssFontSize; +use alloc::string::{String, ToString}; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Can be one of the [CSS font sizes](https://www.w3.org/2021/06/musicxml40/musicxml-reference/data-types/css-font-size/) diff --git a/musicxml/src/datatypes/font_style.rs b/musicxml/src/datatypes/font_style.rs index cc197a2..fc85497 100644 --- a/musicxml/src/datatypes/font_style.rs +++ b/musicxml/src/datatypes/font_style.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/font_weight.rs b/musicxml/src/datatypes/font_weight.rs index 2623cf2..be50ab5 100644 --- a/musicxml/src/datatypes/font_weight.rs +++ b/musicxml/src/datatypes/font_weight.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/glass_value.rs b/musicxml/src/datatypes/glass_value.rs index eb837fb..1782a86 100644 --- a/musicxml/src/datatypes/glass_value.rs +++ b/musicxml/src/datatypes/glass_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/glyph_type.rs b/musicxml/src/datatypes/glyph_type.rs index b1f3b10..f5e6160 100644 --- a/musicxml/src/datatypes/glyph_type.rs +++ b/musicxml/src/datatypes/glyph_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Defines what type of glyph is being defined in a [Glyph][crate::elements::Glyph] element. diff --git a/musicxml/src/datatypes/group_barline_value.rs b/musicxml/src/datatypes/group_barline_value.rs index b2ab626..199a840 100644 --- a/musicxml/src/datatypes/group_barline_value.rs +++ b/musicxml/src/datatypes/group_barline_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/group_symbol_value.rs b/musicxml/src/datatypes/group_symbol_value.rs index f02dd23..7044f2d 100644 --- a/musicxml/src/datatypes/group_symbol_value.rs +++ b/musicxml/src/datatypes/group_symbol_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/handbell_value.rs b/musicxml/src/datatypes/handbell_value.rs index 5aa05aa..3bd4084 100644 --- a/musicxml/src/datatypes/handbell_value.rs +++ b/musicxml/src/datatypes/handbell_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/harmon_closed_location.rs b/musicxml/src/datatypes/harmon_closed_location.rs index dc2b3da..ff73cf8 100644 --- a/musicxml/src/datatypes/harmon_closed_location.rs +++ b/musicxml/src/datatypes/harmon_closed_location.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/harmon_closed_value.rs b/musicxml/src/datatypes/harmon_closed_value.rs index b434f94..62ac218 100644 --- a/musicxml/src/datatypes/harmon_closed_value.rs +++ b/musicxml/src/datatypes/harmon_closed_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/harmony_arrangement.rs b/musicxml/src/datatypes/harmony_arrangement.rs index a998fd7..3c8f653 100644 --- a/musicxml/src/datatypes/harmony_arrangement.rs +++ b/musicxml/src/datatypes/harmony_arrangement.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/harmony_type.rs b/musicxml/src/datatypes/harmony_type.rs index 6556e10..ab47f4c 100644 --- a/musicxml/src/datatypes/harmony_type.rs +++ b/musicxml/src/datatypes/harmony_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/hole_closed_location.rs b/musicxml/src/datatypes/hole_closed_location.rs index 9b731dc..40d2554 100644 --- a/musicxml/src/datatypes/hole_closed_location.rs +++ b/musicxml/src/datatypes/hole_closed_location.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/hole_closed_value.rs b/musicxml/src/datatypes/hole_closed_value.rs index 5ca98a2..054fbcd 100644 --- a/musicxml/src/datatypes/hole_closed_value.rs +++ b/musicxml/src/datatypes/hole_closed_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/id.rs b/musicxml/src/datatypes/id.rs index f64cad8..f6e298f 100644 --- a/musicxml/src/datatypes/id.rs +++ b/musicxml/src/datatypes/id.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#ID). /// diff --git a/musicxml/src/datatypes/idref.rs b/musicxml/src/datatypes/idref.rs index 8ffd567..2363a5a 100644 --- a/musicxml/src/datatypes/idref.rs +++ b/musicxml/src/datatypes/idref.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#IDREF). /// diff --git a/musicxml/src/datatypes/integer.rs b/musicxml/src/datatypes/integer.rs index 898926f..0054722 100644 --- a/musicxml/src/datatypes/integer.rs +++ b/musicxml/src/datatypes/integer.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#integer). /// diff --git a/musicxml/src/datatypes/kind_value.rs b/musicxml/src/datatypes/kind_value.rs index 44c9e46..7d0d18a 100644 --- a/musicxml/src/datatypes/kind_value.rs +++ b/musicxml/src/datatypes/kind_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/left_center_right.rs b/musicxml/src/datatypes/left_center_right.rs index a018ee3..8098b41 100644 --- a/musicxml/src/datatypes/left_center_right.rs +++ b/musicxml/src/datatypes/left_center_right.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/left_right.rs b/musicxml/src/datatypes/left_right.rs index f00abb8..678064b 100644 --- a/musicxml/src/datatypes/left_right.rs +++ b/musicxml/src/datatypes/left_right.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/line_end.rs b/musicxml/src/datatypes/line_end.rs index f547e3f..94f7ed7 100644 --- a/musicxml/src/datatypes/line_end.rs +++ b/musicxml/src/datatypes/line_end.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/line_length.rs b/musicxml/src/datatypes/line_length.rs index c9c979a..4392970 100644 --- a/musicxml/src/datatypes/line_length.rs +++ b/musicxml/src/datatypes/line_length.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/line_shape.rs b/musicxml/src/datatypes/line_shape.rs index 601945f..62ccc7e 100644 --- a/musicxml/src/datatypes/line_shape.rs +++ b/musicxml/src/datatypes/line_shape.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/line_type.rs b/musicxml/src/datatypes/line_type.rs index 689ce89..fa8b5c4 100644 --- a/musicxml/src/datatypes/line_type.rs +++ b/musicxml/src/datatypes/line_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/line_width_type.rs b/musicxml/src/datatypes/line_width_type.rs index 611e404..4dd56f6 100644 --- a/musicxml/src/datatypes/line_width_type.rs +++ b/musicxml/src/datatypes/line_width_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Defines what type of line is being defined in a [LineWidth][crate::elements::LineWidth] element. diff --git a/musicxml/src/datatypes/margin_type.rs b/musicxml/src/datatypes/margin_type.rs index 4ed3fec..33484bd 100644 --- a/musicxml/src/datatypes/margin_type.rs +++ b/musicxml/src/datatypes/margin_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/measure_numbering_value.rs b/musicxml/src/datatypes/measure_numbering_value.rs index 7a16ad7..5ea7541 100644 --- a/musicxml/src/datatypes/measure_numbering_value.rs +++ b/musicxml/src/datatypes/measure_numbering_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/measure_text.rs b/musicxml/src/datatypes/measure_text.rs index d888058..c0841e7 100644 --- a/musicxml/src/datatypes/measure_text.rs +++ b/musicxml/src/datatypes/measure_text.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Used for the `text` attribute of [Measure][crate::elements::Measure] elements. /// diff --git a/musicxml/src/datatypes/membrane_value.rs b/musicxml/src/datatypes/membrane_value.rs index f2e5add..a2a0cfe 100644 --- a/musicxml/src/datatypes/membrane_value.rs +++ b/musicxml/src/datatypes/membrane_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/metal_value.rs b/musicxml/src/datatypes/metal_value.rs index 115156f..8e5402c 100644 --- a/musicxml/src/datatypes/metal_value.rs +++ b/musicxml/src/datatypes/metal_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/midi_128.rs b/musicxml/src/datatypes/midi_128.rs index b1e6996..4c9f4ff 100644 --- a/musicxml/src/datatypes/midi_128.rs +++ b/musicxml/src/datatypes/midi_128.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Used to express MIDI 1.0 values that range from 1 to 128. /// diff --git a/musicxml/src/datatypes/midi_16.rs b/musicxml/src/datatypes/midi_16.rs index 7295897..a3d72d3 100644 --- a/musicxml/src/datatypes/midi_16.rs +++ b/musicxml/src/datatypes/midi_16.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Used to express MIDI 1.0 values that range from 1 to 16. /// diff --git a/musicxml/src/datatypes/midi_16384.rs b/musicxml/src/datatypes/midi_16384.rs index 9a81465..d882893 100644 --- a/musicxml/src/datatypes/midi_16384.rs +++ b/musicxml/src/datatypes/midi_16384.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Used to express MIDI 1.0 values that range from 1 to 16,384. /// diff --git a/musicxml/src/datatypes/millimeters.rs b/musicxml/src/datatypes/millimeters.rs index 4ec6eec..366d757 100644 --- a/musicxml/src/datatypes/millimeters.rs +++ b/musicxml/src/datatypes/millimeters.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// Used to represent millimeters. /// diff --git a/musicxml/src/datatypes/milliseconds.rs b/musicxml/src/datatypes/milliseconds.rs index d4a79dc..57a6917 100644 --- a/musicxml/src/datatypes/milliseconds.rs +++ b/musicxml/src/datatypes/milliseconds.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// Represents an integral number of milliseconds. /// diff --git a/musicxml/src/datatypes/mode.rs b/musicxml/src/datatypes/mode.rs index fe13e39..ae22d93 100644 --- a/musicxml/src/datatypes/mode.rs +++ b/musicxml/src/datatypes/mode.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/mute.rs b/musicxml/src/datatypes/mute.rs index 2a6b4c0..861c625 100644 --- a/musicxml/src/datatypes/mute.rs +++ b/musicxml/src/datatypes/mute.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/nmtoken.rs b/musicxml/src/datatypes/nmtoken.rs index 9864f64..f36b4b9 100644 --- a/musicxml/src/datatypes/nmtoken.rs +++ b/musicxml/src/datatypes/nmtoken.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#NMTOKEN). /// diff --git a/musicxml/src/datatypes/non_negative_decimal.rs b/musicxml/src/datatypes/non_negative_decimal.rs index ff15d08..5c7053d 100644 --- a/musicxml/src/datatypes/non_negative_decimal.rs +++ b/musicxml/src/datatypes/non_negative_decimal.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Specifies a non-negative decimal value. /// diff --git a/musicxml/src/datatypes/non_negative_integer.rs b/musicxml/src/datatypes/non_negative_integer.rs index 8ad4476..ea54a21 100644 --- a/musicxml/src/datatypes/non_negative_integer.rs +++ b/musicxml/src/datatypes/non_negative_integer.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger). /// diff --git a/musicxml/src/datatypes/note_size_type.rs b/musicxml/src/datatypes/note_size_type.rs index 5197c80..a1dc400 100644 --- a/musicxml/src/datatypes/note_size_type.rs +++ b/musicxml/src/datatypes/note_size_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/note_type_value.rs b/musicxml/src/datatypes/note_type_value.rs index c74a4c9..44282ed 100644 --- a/musicxml/src/datatypes/note_type_value.rs +++ b/musicxml/src/datatypes/note_type_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/notehead_value.rs b/musicxml/src/datatypes/notehead_value.rs index 962c32d..cd02e6b 100644 --- a/musicxml/src/datatypes/notehead_value.rs +++ b/musicxml/src/datatypes/notehead_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/number_level.rs b/musicxml/src/datatypes/number_level.rs index 14e894b..5a3be66 100644 --- a/musicxml/src/datatypes/number_level.rs +++ b/musicxml/src/datatypes/number_level.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Distinguishes up to 16 concurrent objects of the same type when the objects overlap in MusicXML document order. /// diff --git a/musicxml/src/datatypes/number_of_lines.rs b/musicxml/src/datatypes/number_of_lines.rs index b4f33ac..8038f53 100644 --- a/musicxml/src/datatypes/number_of_lines.rs +++ b/musicxml/src/datatypes/number_of_lines.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Used to specify the number of lines in text decoration attributes. /// diff --git a/musicxml/src/datatypes/number_or_normal.rs b/musicxml/src/datatypes/number_or_normal.rs index f401387..e886213 100644 --- a/musicxml/src/datatypes/number_or_normal.rs +++ b/musicxml/src/datatypes/number_or_normal.rs @@ -1,3 +1,4 @@ +use alloc::string::{String, ToString}; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Can be either a decimal number or the string "normal". diff --git a/musicxml/src/datatypes/numeral_mode.rs b/musicxml/src/datatypes/numeral_mode.rs index 412cb21..c10311e 100644 --- a/musicxml/src/datatypes/numeral_mode.rs +++ b/musicxml/src/datatypes/numeral_mode.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/numeral_value.rs b/musicxml/src/datatypes/numeral_value.rs index 2d3e1df..697085c 100644 --- a/musicxml/src/datatypes/numeral_value.rs +++ b/musicxml/src/datatypes/numeral_value.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Represents a Roman numeral or Nashville number value as a positive integer from 1 to 7. /// diff --git a/musicxml/src/datatypes/octave.rs b/musicxml/src/datatypes/octave.rs index 725bf8f..df8d92a 100644 --- a/musicxml/src/datatypes/octave.rs +++ b/musicxml/src/datatypes/octave.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Represents octaves by the numbers 0 to 9, where 4 indicates the octave started by middle C. /// diff --git a/musicxml/src/datatypes/on_off.rs b/musicxml/src/datatypes/on_off.rs index 35d96f5..e967d7a 100644 --- a/musicxml/src/datatypes/on_off.rs +++ b/musicxml/src/datatypes/on_off.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/over_under.rs b/musicxml/src/datatypes/over_under.rs index 5d096a0..4b807d2 100644 --- a/musicxml/src/datatypes/over_under.rs +++ b/musicxml/src/datatypes/over_under.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/pedal_type.rs b/musicxml/src/datatypes/pedal_type.rs index e0bd419..13fcc46 100644 --- a/musicxml/src/datatypes/pedal_type.rs +++ b/musicxml/src/datatypes/pedal_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/percent.rs b/musicxml/src/datatypes/percent.rs index 8b0d51f..7f21e0b 100644 --- a/musicxml/src/datatypes/percent.rs +++ b/musicxml/src/datatypes/percent.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Specifies a percentage from 0 to 100. /// diff --git a/musicxml/src/datatypes/pitched_value.rs b/musicxml/src/datatypes/pitched_value.rs index 6b84cb3..fb2f88b 100644 --- a/musicxml/src/datatypes/pitched_value.rs +++ b/musicxml/src/datatypes/pitched_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/positive_divisions.rs b/musicxml/src/datatypes/positive_divisions.rs index 075863e..119cc7e 100644 --- a/musicxml/src/datatypes/positive_divisions.rs +++ b/musicxml/src/datatypes/positive_divisions.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Represents how many integer divisions per quarter note represent a note duration. /// diff --git a/musicxml/src/datatypes/positive_integer.rs b/musicxml/src/datatypes/positive_integer.rs index fcaefa8..d855a91 100644 --- a/musicxml/src/datatypes/positive_integer.rs +++ b/musicxml/src/datatypes/positive_integer.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#positiveInteger). /// diff --git a/musicxml/src/datatypes/positive_integer_or_empty.rs b/musicxml/src/datatypes/positive_integer_or_empty.rs index 4f56fa5..fedcc9e 100644 --- a/musicxml/src/datatypes/positive_integer_or_empty.rs +++ b/musicxml/src/datatypes/positive_integer_or_empty.rs @@ -1,3 +1,4 @@ +use alloc::string::{String, ToString}; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Represents a positive integer or an empty value. diff --git a/musicxml/src/datatypes/principal_voice_symbol.rs b/musicxml/src/datatypes/principal_voice_symbol.rs index 26a87ed..3679c00 100644 --- a/musicxml/src/datatypes/principal_voice_symbol.rs +++ b/musicxml/src/datatypes/principal_voice_symbol.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/right_left_middle.rs b/musicxml/src/datatypes/right_left_middle.rs index 52085fd..80e339e 100644 --- a/musicxml/src/datatypes/right_left_middle.rs +++ b/musicxml/src/datatypes/right_left_middle.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/rotation_degrees.rs b/musicxml/src/datatypes/rotation_degrees.rs index 609a4e8..a838074 100644 --- a/musicxml/src/datatypes/rotation_degrees.rs +++ b/musicxml/src/datatypes/rotation_degrees.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Specifies rotation, pan, and elevation values in degrees. /// diff --git a/musicxml/src/datatypes/semi_pitched.rs b/musicxml/src/datatypes/semi_pitched.rs index 41ff329..6b62a75 100644 --- a/musicxml/src/datatypes/semi_pitched.rs +++ b/musicxml/src/datatypes/semi_pitched.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/semitones.rs b/musicxml/src/datatypes/semitones.rs index d6719b0..2a469c7 100644 --- a/musicxml/src/datatypes/semitones.rs +++ b/musicxml/src/datatypes/semitones.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// Represents semitones, used for chromatic alteration. /// diff --git a/musicxml/src/datatypes/show_frets.rs b/musicxml/src/datatypes/show_frets.rs index b7f1837..cc706b7 100644 --- a/musicxml/src/datatypes/show_frets.rs +++ b/musicxml/src/datatypes/show_frets.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/show_tuplet.rs b/musicxml/src/datatypes/show_tuplet.rs index 9fc0004..31ad48b 100644 --- a/musicxml/src/datatypes/show_tuplet.rs +++ b/musicxml/src/datatypes/show_tuplet.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/smufl_accidental_glyph_name.rs b/musicxml/src/datatypes/smufl_accidental_glyph_name.rs index 14e3bd8..c9432f3 100644 --- a/musicxml/src/datatypes/smufl_accidental_glyph_name.rs +++ b/musicxml/src/datatypes/smufl_accidental_glyph_name.rs @@ -1,8 +1,9 @@ use super::smufl_glyph_name::SmuflGlyphName; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; use regex::Regex; -use std::ops::Deref; /// Used to reference a specific Standard Music Font Layout (SMuFL) accidental character. /// diff --git a/musicxml/src/datatypes/smufl_coda_glyph_name.rs b/musicxml/src/datatypes/smufl_coda_glyph_name.rs index 84180fa..a65f128 100644 --- a/musicxml/src/datatypes/smufl_coda_glyph_name.rs +++ b/musicxml/src/datatypes/smufl_coda_glyph_name.rs @@ -1,8 +1,9 @@ use super::smufl_glyph_name::SmuflGlyphName; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; use regex::Regex; -use std::ops::Deref; /// Used to reference a specific Standard Music Font Layout (SMuFL) coda character. /// diff --git a/musicxml/src/datatypes/smufl_glyph_name.rs b/musicxml/src/datatypes/smufl_glyph_name.rs index 75b59bd..7c1416c 100644 --- a/musicxml/src/datatypes/smufl_glyph_name.rs +++ b/musicxml/src/datatypes/smufl_glyph_name.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// Used for attributes that reference a specific Standard Music Font Layout (SMuFL) character. /// diff --git a/musicxml/src/datatypes/smufl_lyrics_glyph_name.rs b/musicxml/src/datatypes/smufl_lyrics_glyph_name.rs index a0f2e4c..765a2fa 100644 --- a/musicxml/src/datatypes/smufl_lyrics_glyph_name.rs +++ b/musicxml/src/datatypes/smufl_lyrics_glyph_name.rs @@ -1,8 +1,9 @@ use super::smufl_glyph_name::SmuflGlyphName; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; use regex::Regex; -use std::ops::Deref; /// Used to reference a specific Standard Music Font Layout (SMuFL) lyrics elision character. /// diff --git a/musicxml/src/datatypes/smufl_pictogram_glyph_name.rs b/musicxml/src/datatypes/smufl_pictogram_glyph_name.rs index b82dada..96cfaf9 100644 --- a/musicxml/src/datatypes/smufl_pictogram_glyph_name.rs +++ b/musicxml/src/datatypes/smufl_pictogram_glyph_name.rs @@ -1,8 +1,9 @@ use super::smufl_glyph_name::SmuflGlyphName; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; use regex::Regex; -use std::ops::Deref; /// Used to reference a specific Standard Music Font Layout (SMuFL) percussion pictogram character. /// diff --git a/musicxml/src/datatypes/smufl_segno_glyph_name.rs b/musicxml/src/datatypes/smufl_segno_glyph_name.rs index 12b80b4..c5bc249 100644 --- a/musicxml/src/datatypes/smufl_segno_glyph_name.rs +++ b/musicxml/src/datatypes/smufl_segno_glyph_name.rs @@ -1,8 +1,9 @@ use super::smufl_glyph_name::SmuflGlyphName; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; use regex::Regex; -use std::ops::Deref; /// Used to reference a specific Standard Music Font Layout (SMuFL) segno character. /// diff --git a/musicxml/src/datatypes/smufl_wavy_line_glyph_name.rs b/musicxml/src/datatypes/smufl_wavy_line_glyph_name.rs index d497a12..54d8715 100644 --- a/musicxml/src/datatypes/smufl_wavy_line_glyph_name.rs +++ b/musicxml/src/datatypes/smufl_wavy_line_glyph_name.rs @@ -1,8 +1,9 @@ use super::smufl_glyph_name::SmuflGlyphName; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; use regex::Regex; -use std::ops::Deref; /// Used to reference a specific Standard Music Font Layout (SMuFL) wavy line character. /// diff --git a/musicxml/src/datatypes/staff_divide_symbol.rs b/musicxml/src/datatypes/staff_divide_symbol.rs index c5be98c..7069b95 100644 --- a/musicxml/src/datatypes/staff_divide_symbol.rs +++ b/musicxml/src/datatypes/staff_divide_symbol.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/staff_line.rs b/musicxml/src/datatypes/staff_line.rs index 088e9c6..38cf560 100644 --- a/musicxml/src/datatypes/staff_line.rs +++ b/musicxml/src/datatypes/staff_line.rs @@ -1,7 +1,8 @@ use super::positive_integer::PositiveInteger; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Indicates the line on a given staff. /// diff --git a/musicxml/src/datatypes/staff_line_position.rs b/musicxml/src/datatypes/staff_line_position.rs index f16b359..ed2e954 100644 --- a/musicxml/src/datatypes/staff_line_position.rs +++ b/musicxml/src/datatypes/staff_line_position.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// Indicates the line position on a given staff. /// diff --git a/musicxml/src/datatypes/staff_number.rs b/musicxml/src/datatypes/staff_number.rs index 6edff58..dad9720 100644 --- a/musicxml/src/datatypes/staff_number.rs +++ b/musicxml/src/datatypes/staff_number.rs @@ -1,7 +1,8 @@ use super::positive_integer::PositiveInteger; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Indicates staff numbers within a multi-staff part. /// diff --git a/musicxml/src/datatypes/staff_type.rs b/musicxml/src/datatypes/staff_type.rs index 48c75c8..716a75e 100644 --- a/musicxml/src/datatypes/staff_type.rs +++ b/musicxml/src/datatypes/staff_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/start_note.rs b/musicxml/src/datatypes/start_note.rs index b1510e1..9515eac 100644 --- a/musicxml/src/datatypes/start_note.rs +++ b/musicxml/src/datatypes/start_note.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/start_stop.rs b/musicxml/src/datatypes/start_stop.rs index 57fe504..eafd08a 100644 --- a/musicxml/src/datatypes/start_stop.rs +++ b/musicxml/src/datatypes/start_stop.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/start_stop_continue.rs b/musicxml/src/datatypes/start_stop_continue.rs index bd6d788..94f5cee 100644 --- a/musicxml/src/datatypes/start_stop_continue.rs +++ b/musicxml/src/datatypes/start_stop_continue.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/start_stop_discontinue.rs b/musicxml/src/datatypes/start_stop_discontinue.rs index dde068f..11042e0 100644 --- a/musicxml/src/datatypes/start_stop_discontinue.rs +++ b/musicxml/src/datatypes/start_stop_discontinue.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/start_stop_single.rs b/musicxml/src/datatypes/start_stop_single.rs index d80ba68..8b0f197 100644 --- a/musicxml/src/datatypes/start_stop_single.rs +++ b/musicxml/src/datatypes/start_stop_single.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/stem_value.rs b/musicxml/src/datatypes/stem_value.rs index 71f716e..72a1ac8 100644 --- a/musicxml/src/datatypes/stem_value.rs +++ b/musicxml/src/datatypes/stem_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/step.rs b/musicxml/src/datatypes/step.rs index 83e62f2..14d59db 100644 --- a/musicxml/src/datatypes/step.rs +++ b/musicxml/src/datatypes/step.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/stick_location.rs b/musicxml/src/datatypes/stick_location.rs index 8d208f1..70b8a2e 100644 --- a/musicxml/src/datatypes/stick_location.rs +++ b/musicxml/src/datatypes/stick_location.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/stick_material.rs b/musicxml/src/datatypes/stick_material.rs index 69278d9..a11a0dc 100644 --- a/musicxml/src/datatypes/stick_material.rs +++ b/musicxml/src/datatypes/stick_material.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/stick_type.rs b/musicxml/src/datatypes/stick_type.rs index af93f30..f5421e2 100644 --- a/musicxml/src/datatypes/stick_type.rs +++ b/musicxml/src/datatypes/stick_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/string_number.rs b/musicxml/src/datatypes/string_number.rs index fd4c39a..f135852 100644 --- a/musicxml/src/datatypes/string_number.rs +++ b/musicxml/src/datatypes/string_number.rs @@ -1,7 +1,8 @@ use super::positive_integer::PositiveInteger; +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Indicates a string number. /// diff --git a/musicxml/src/datatypes/swing_type_value.rs b/musicxml/src/datatypes/swing_type_value.rs index 8a530f5..d802903 100644 --- a/musicxml/src/datatypes/swing_type_value.rs +++ b/musicxml/src/datatypes/swing_type_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/syllabic.rs b/musicxml/src/datatypes/syllabic.rs index 33ad159..671f9d4 100644 --- a/musicxml/src/datatypes/syllabic.rs +++ b/musicxml/src/datatypes/syllabic.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/symbol_size.rs b/musicxml/src/datatypes/symbol_size.rs index 0319769..f62d6da 100644 --- a/musicxml/src/datatypes/symbol_size.rs +++ b/musicxml/src/datatypes/symbol_size.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/sync_type.rs b/musicxml/src/datatypes/sync_type.rs index d504bb5..7d707c5 100644 --- a/musicxml/src/datatypes/sync_type.rs +++ b/musicxml/src/datatypes/sync_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/system_relation.rs b/musicxml/src/datatypes/system_relation.rs index f4bdf28..8d056ff 100644 --- a/musicxml/src/datatypes/system_relation.rs +++ b/musicxml/src/datatypes/system_relation.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/system_relation_number.rs b/musicxml/src/datatypes/system_relation_number.rs index 9923ae0..ac8c14e 100644 --- a/musicxml/src/datatypes/system_relation_number.rs +++ b/musicxml/src/datatypes/system_relation_number.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/tap_hand.rs b/musicxml/src/datatypes/tap_hand.rs index 4a37e0b..8dc7ecc 100644 --- a/musicxml/src/datatypes/tap_hand.rs +++ b/musicxml/src/datatypes/tap_hand.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/tenths.rs b/musicxml/src/datatypes/tenths.rs index 62ebc63..f94335b 100644 --- a/musicxml/src/datatypes/tenths.rs +++ b/musicxml/src/datatypes/tenths.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// Representing tenths of interline staff space (positive or negative). /// diff --git a/musicxml/src/datatypes/text_direction.rs b/musicxml/src/datatypes/text_direction.rs index 15e0dd7..7669179 100644 --- a/musicxml/src/datatypes/text_direction.rs +++ b/musicxml/src/datatypes/text_direction.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/tied_type.rs b/musicxml/src/datatypes/tied_type.rs index fadcbea..85fe12b 100644 --- a/musicxml/src/datatypes/tied_type.rs +++ b/musicxml/src/datatypes/tied_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/time_only.rs b/musicxml/src/datatypes/time_only.rs index 3fe2b51..0189cd3 100644 --- a/musicxml/src/datatypes/time_only.rs +++ b/musicxml/src/datatypes/time_only.rs @@ -1,6 +1,7 @@ use super::positive_integer::PositiveInteger; +use alloc::{string::String, string::ToString, vec::Vec}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; -use std::ops::Deref; /// Used to indicate that a particular playback- or listening-related element only applies particular times /// through a repeated section. diff --git a/musicxml/src/datatypes/time_relation.rs b/musicxml/src/datatypes/time_relation.rs index d1a1cd9..390e62b 100644 --- a/musicxml/src/datatypes/time_relation.rs +++ b/musicxml/src/datatypes/time_relation.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/time_separator.rs b/musicxml/src/datatypes/time_separator.rs index 683bec4..4737ba6 100644 --- a/musicxml/src/datatypes/time_separator.rs +++ b/musicxml/src/datatypes/time_separator.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/time_symbol.rs b/musicxml/src/datatypes/time_symbol.rs index 36813bb..af942a2 100644 --- a/musicxml/src/datatypes/time_symbol.rs +++ b/musicxml/src/datatypes/time_symbol.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/tip_direction.rs b/musicxml/src/datatypes/tip_direction.rs index 3067cf8..419d0b3 100644 --- a/musicxml/src/datatypes/tip_direction.rs +++ b/musicxml/src/datatypes/tip_direction.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/token.rs b/musicxml/src/datatypes/token.rs index 33756a4..acf5d4e 100644 --- a/musicxml/src/datatypes/token.rs +++ b/musicxml/src/datatypes/token.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C XML Schema standard](https://www.w3.org/TR/xmlschema-2/#token). /// diff --git a/musicxml/src/datatypes/top_bottom.rs b/musicxml/src/datatypes/top_bottom.rs index f18a8de..18839ff 100644 --- a/musicxml/src/datatypes/top_bottom.rs +++ b/musicxml/src/datatypes/top_bottom.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/tremolo_marks.rs b/musicxml/src/datatypes/tremolo_marks.rs index 31707cd..d97956f 100644 --- a/musicxml/src/datatypes/tremolo_marks.rs +++ b/musicxml/src/datatypes/tremolo_marks.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Represents the number of tremolo marks by a number from 0 to 8. /// diff --git a/musicxml/src/datatypes/tremolo_type.rs b/musicxml/src/datatypes/tremolo_type.rs index 65f1541..5e19d3e 100644 --- a/musicxml/src/datatypes/tremolo_type.rs +++ b/musicxml/src/datatypes/tremolo_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/trill_beats.rs b/musicxml/src/datatypes/trill_beats.rs index 1429b0f..bc7491c 100644 --- a/musicxml/src/datatypes/trill_beats.rs +++ b/musicxml/src/datatypes/trill_beats.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::DatatypeSerialize; -use std::ops::Deref; /// Specifies the beats used in a `trill-sound` or `bend-sound` attribute group. /// diff --git a/musicxml/src/datatypes/trill_step.rs b/musicxml/src/datatypes/trill_step.rs index dfaeb37..1dc4407 100644 --- a/musicxml/src/datatypes/trill_step.rs +++ b/musicxml/src/datatypes/trill_step.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/two_note_turn.rs b/musicxml/src/datatypes/two_note_turn.rs index 642f76b..1d2ba58 100644 --- a/musicxml/src/datatypes/two_note_turn.rs +++ b/musicxml/src/datatypes/two_note_turn.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/up_down.rs b/musicxml/src/datatypes/up_down.rs index e6b24cf..eec3652 100644 --- a/musicxml/src/datatypes/up_down.rs +++ b/musicxml/src/datatypes/up_down.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/up_down_stop_continue.rs b/musicxml/src/datatypes/up_down_stop_continue.rs index 568af1b..ad4c75d 100644 --- a/musicxml/src/datatypes/up_down_stop_continue.rs +++ b/musicxml/src/datatypes/up_down_stop_continue.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/upright_inverted.rs b/musicxml/src/datatypes/upright_inverted.rs index 5185eb7..bf8b02c 100644 --- a/musicxml/src/datatypes/upright_inverted.rs +++ b/musicxml/src/datatypes/upright_inverted.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/valign.rs b/musicxml/src/datatypes/valign.rs index 90b621a..b60193b 100644 --- a/musicxml/src/datatypes/valign.rs +++ b/musicxml/src/datatypes/valign.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/valign_image.rs b/musicxml/src/datatypes/valign_image.rs index 81d9c67..1a1131d 100644 --- a/musicxml/src/datatypes/valign_image.rs +++ b/musicxml/src/datatypes/valign_image.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/wedge_type.rs b/musicxml/src/datatypes/wedge_type.rs index e041a7f..462f8d1 100644 --- a/musicxml/src/datatypes/wedge_type.rs +++ b/musicxml/src/datatypes/wedge_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/winged.rs b/musicxml/src/datatypes/winged.rs index edc9841..02f333c 100644 --- a/musicxml/src/datatypes/winged.rs +++ b/musicxml/src/datatypes/winged.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/wood_value.rs b/musicxml/src/datatypes/wood_value.rs index b46388c..f0735ae 100644 --- a/musicxml/src/datatypes/wood_value.rs +++ b/musicxml/src/datatypes/wood_value.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/xlink_actuate.rs b/musicxml/src/datatypes/xlink_actuate.rs index 6aecd5d..bd6a548 100644 --- a/musicxml/src/datatypes/xlink_actuate.rs +++ b/musicxml/src/datatypes/xlink_actuate.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/xlink_show.rs b/musicxml/src/datatypes/xlink_show.rs index 08fc22d..85a4fe1 100644 --- a/musicxml/src/datatypes/xlink_show.rs +++ b/musicxml/src/datatypes/xlink_show.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/xlink_type.rs b/musicxml/src/datatypes/xlink_type.rs index b0779c4..e2595ae 100644 --- a/musicxml/src/datatypes/xlink_type.rs +++ b/musicxml/src/datatypes/xlink_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/xml_lang.rs b/musicxml/src/datatypes/xml_lang.rs index a724502..b2eba37 100644 --- a/musicxml/src/datatypes/xml_lang.rs +++ b/musicxml/src/datatypes/xml_lang.rs @@ -1,6 +1,7 @@ +use alloc::string::{String, ToString}; +use core::ops::Deref; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; -use std::ops::Deref; /// See the definition in the [W3C Extensible Markup Language recommendation](https://www.w3.org/TR/xml/#sec-lang-tag). /// diff --git a/musicxml/src/datatypes/xml_space.rs b/musicxml/src/datatypes/xml_space.rs index 2b39707..8c7f1a0 100644 --- a/musicxml/src/datatypes/xml_space.rs +++ b/musicxml/src/datatypes/xml_space.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/yes_no.rs b/musicxml/src/datatypes/yes_no.rs index 1fb59f5..a63bc0f 100644 --- a/musicxml/src/datatypes/yes_no.rs +++ b/musicxml/src/datatypes/yes_no.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use musicxml_macros::{DatatypeDeserialize, DatatypeSerialize}; diff --git a/musicxml/src/datatypes/yes_no_number.rs b/musicxml/src/datatypes/yes_no_number.rs index 99e18ad..f7a02da 100644 --- a/musicxml/src/datatypes/yes_no_number.rs +++ b/musicxml/src/datatypes/yes_no_number.rs @@ -1,4 +1,5 @@ use super::decimal::Decimal; +use alloc::string::{String, ToString}; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; /// Used for attributes that can be either boolean or numeric values. diff --git a/musicxml/src/datatypes/yyyy_mm_dd.rs b/musicxml/src/datatypes/yyyy_mm_dd.rs index 08a7c24..2d833f1 100644 --- a/musicxml/src/datatypes/yyyy_mm_dd.rs +++ b/musicxml/src/datatypes/yyyy_mm_dd.rs @@ -1,6 +1,6 @@ +use alloc::string::String; use musicxml_internal::{DatatypeDeserializer, DatatypeSerializer}; use regex::Regex; -use std::fmt; /// Represents dates in the yyyy-mm-dd format, following ISO 8601. /// @@ -22,8 +22,8 @@ impl YyyyMmDd { } } -impl fmt::Display for YyyyMmDd { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result { +impl core::fmt::Display for YyyyMmDd { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { write!(f, "{:02}-{:02}-{:02})", self.year, self.month, self.date) } } diff --git a/musicxml/src/elements/accent.rs b/musicxml/src/elements/accent.rs index 722630a..589e809 100644 --- a/musicxml/src/elements/accent.rs +++ b/musicxml/src/elements/accent.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accidental.rs b/musicxml/src/elements/accidental.rs index c314f67..0a1c76d 100644 --- a/musicxml/src/elements/accidental.rs +++ b/musicxml/src/elements/accidental.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AccidentalValue, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflAccidentalGlyphName, SymbolSize, Tenths, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accidental_mark.rs b/musicxml/src/elements/accidental_mark.rs index 1fcecfb..82cfb25 100644 --- a/musicxml/src/elements/accidental_mark.rs +++ b/musicxml/src/elements/accidental_mark.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, AccidentalValue, Color, FontFamily, FontSize, FontStyle, FontWeight, Id, SmuflAccidentalGlyphName, SymbolSize, Tenths, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accidental_text.rs b/musicxml/src/elements/accidental_text.rs index dbf52f1..756a03c 100644 --- a/musicxml/src/elements/accidental_text.rs +++ b/musicxml/src/elements/accidental_text.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AccidentalValue, Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, SmuflAccidentalGlyphName, Tenths, TextDirection, Valign, XmlLang, XmlSpace, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accord.rs b/musicxml/src/elements/accord.rs index e7aa06a..2e7b467 100644 --- a/musicxml/src/elements/accord.rs +++ b/musicxml/src/elements/accord.rs @@ -1,5 +1,6 @@ use super::{TuningAlter, TuningOctave, TuningStep}; use crate::datatypes::StringNumber; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accordion_high.rs b/musicxml/src/elements/accordion_high.rs index 4ecfc60..9a804f8 100644 --- a/musicxml/src/elements/accordion_high.rs +++ b/musicxml/src/elements/accordion_high.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accordion_low.rs b/musicxml/src/elements/accordion_low.rs index d96b627..9b2ccb5 100644 --- a/musicxml/src/elements/accordion_low.rs +++ b/musicxml/src/elements/accordion_low.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accordion_middle.rs b/musicxml/src/elements/accordion_middle.rs index 0b95426..6f915a3 100644 --- a/musicxml/src/elements/accordion_middle.rs +++ b/musicxml/src/elements/accordion_middle.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/accordion_registration.rs b/musicxml/src/elements/accordion_registration.rs index 5068e39..9eb2e63 100644 --- a/musicxml/src/elements/accordion_registration.rs +++ b/musicxml/src/elements/accordion_registration.rs @@ -1,5 +1,6 @@ use super::{AccordionHigh, AccordionLow, AccordionMiddle}; use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/actual_notes.rs b/musicxml/src/elements/actual_notes.rs index 3b2590d..03ff963 100644 --- a/musicxml/src/elements/actual_notes.rs +++ b/musicxml/src/elements/actual_notes.rs @@ -1,4 +1,5 @@ use crate::datatypes::NonNegativeInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/alter.rs b/musicxml/src/elements/alter.rs index 69b3196..d46a8ae 100644 --- a/musicxml/src/elements/alter.rs +++ b/musicxml/src/elements/alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::Semitones; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/appearance.rs b/musicxml/src/elements/appearance.rs index f778058..be2beaf 100644 --- a/musicxml/src/elements/appearance.rs +++ b/musicxml/src/elements/appearance.rs @@ -1,4 +1,5 @@ use super::{Distance, Glyph, LineWidth, NoteSize, OtherAppearance}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/arpeggiate.rs b/musicxml/src/elements/arpeggiate.rs index c53c0d9..7779f76 100644 --- a/musicxml/src/elements/arpeggiate.rs +++ b/musicxml/src/elements/arpeggiate.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, Id, NumberLevel, Tenths, UpDown, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/arrow.rs b/musicxml/src/elements/arrow.rs index e7d3849..858e1dc 100644 --- a/musicxml/src/elements/arrow.rs +++ b/musicxml/src/elements/arrow.rs @@ -1,5 +1,6 @@ use super::{ArrowDirection, ArrowStyle, Arrowhead, CircularArrow}; use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/arrow_direction.rs b/musicxml/src/elements/arrow_direction.rs index 501d507..71299be 100644 --- a/musicxml/src/elements/arrow_direction.rs +++ b/musicxml/src/elements/arrow_direction.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/arrow_style.rs b/musicxml/src/elements/arrow_style.rs index d937a83..bc27c68 100644 --- a/musicxml/src/elements/arrow_style.rs +++ b/musicxml/src/elements/arrow_style.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/arrowhead.rs b/musicxml/src/elements/arrowhead.rs index 58896fa..63a35d3 100644 --- a/musicxml/src/elements/arrowhead.rs +++ b/musicxml/src/elements/arrowhead.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/articulations.rs b/musicxml/src/elements/articulations.rs index 3087855..083d73b 100644 --- a/musicxml/src/elements/articulations.rs +++ b/musicxml/src/elements/articulations.rs @@ -3,6 +3,7 @@ use super::{ Staccatissimo, Staccato, Stress, StrongAccent, Tenuto, Unstress, }; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/artificial.rs b/musicxml/src/elements/artificial.rs index 8ff2baa..d41b72d 100644 --- a/musicxml/src/elements/artificial.rs +++ b/musicxml/src/elements/artificial.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/assess.rs b/musicxml/src/elements/assess.rs index bd6b156..dffc769 100644 --- a/musicxml/src/elements/assess.rs +++ b/musicxml/src/elements/assess.rs @@ -1,4 +1,5 @@ use crate::datatypes::{IdRef, TimeOnly, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/attributes.rs b/musicxml/src/elements/attributes.rs index 3e5e456..008d895 100644 --- a/musicxml/src/elements/attributes.rs +++ b/musicxml/src/elements/attributes.rs @@ -2,6 +2,7 @@ use super::{ Clef, Directive, Divisions, Footnote, ForPart, Instruments, Key, Level, MeasureStyle, PartSymbol, StaffDetails, Staves, Time, Transpose, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; @@ -60,6 +61,7 @@ mod attributes_tests { }; use crate::elements::*; use crate::parser::parse_from_xml_str; + use alloc::{string::String, vec::Vec}; #[test] fn deserialize_valid1() { diff --git a/musicxml/src/elements/backup.rs b/musicxml/src/elements/backup.rs index 489cbd0..b27fad6 100644 --- a/musicxml/src/elements/backup.rs +++ b/musicxml/src/elements/backup.rs @@ -1,4 +1,5 @@ use super::{Duration, Footnote, Level}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bar_style.rs b/musicxml/src/elements/bar_style.rs index 578e710..c09d694 100644 --- a/musicxml/src/elements/bar_style.rs +++ b/musicxml/src/elements/bar_style.rs @@ -1,4 +1,5 @@ use crate::datatypes::Color; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/barline.rs b/musicxml/src/elements/barline.rs index c912330..2710106 100644 --- a/musicxml/src/elements/barline.rs +++ b/musicxml/src/elements/barline.rs @@ -1,5 +1,6 @@ use super::{BarStyle, Coda, Ending, Fermata, Footnote, Level, Repeat, Segno, WavyLine}; use crate::datatypes::{Divisions, Id, RightLeftMiddle, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/barre.rs b/musicxml/src/elements/barre.rs index 116cc55..6214da6 100644 --- a/musicxml/src/elements/barre.rs +++ b/musicxml/src/elements/barre.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, StartStop}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/base_pitch.rs b/musicxml/src/elements/base_pitch.rs index c549c9e..8326fa0 100644 --- a/musicxml/src/elements/base_pitch.rs +++ b/musicxml/src/elements/base_pitch.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bass.rs b/musicxml/src/elements/bass.rs index ed7bf4c..2bc999d 100644 --- a/musicxml/src/elements/bass.rs +++ b/musicxml/src/elements/bass.rs @@ -1,5 +1,6 @@ use super::{BassAlter, BassSeparator, BassStep}; use crate::datatypes::HarmonyArrangement; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bass_alter.rs b/musicxml/src/elements/bass_alter.rs index ce00777..b0d9dd4 100644 --- a/musicxml/src/elements/bass_alter.rs +++ b/musicxml/src/elements/bass_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftRight, Semitones, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bass_separator.rs b/musicxml/src/elements/bass_separator.rs index 7c9fda4..70d25e6 100644 --- a/musicxml/src/elements/bass_separator.rs +++ b/musicxml/src/elements/bass_separator.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bass_step.rs b/musicxml/src/elements/bass_step.rs index ddd989e..93a83b7 100644 --- a/musicxml/src/elements/bass_step.rs +++ b/musicxml/src/elements/bass_step.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Step, Tenths, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beam.rs b/musicxml/src/elements/beam.rs index cf933e2..33cc1c4 100644 --- a/musicxml/src/elements/beam.rs +++ b/musicxml/src/elements/beam.rs @@ -1,4 +1,5 @@ use crate::datatypes::{BeamLevel, BeamValue, Color, Fan, Id, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beat_repeat.rs b/musicxml/src/elements/beat_repeat.rs index a5b1e46..07b891a 100644 --- a/musicxml/src/elements/beat_repeat.rs +++ b/musicxml/src/elements/beat_repeat.rs @@ -1,5 +1,6 @@ use super::{ExceptVoice, SlashDot, SlashType}; use crate::datatypes::{PositiveInteger, StartStop, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beat_type.rs b/musicxml/src/elements/beat_type.rs index 6862a6e..bdf2560 100644 --- a/musicxml/src/elements/beat_type.rs +++ b/musicxml/src/elements/beat_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beat_unit.rs b/musicxml/src/elements/beat_unit.rs index 2b89267..4989c40 100644 --- a/musicxml/src/elements/beat_unit.rs +++ b/musicxml/src/elements/beat_unit.rs @@ -1,4 +1,5 @@ use crate::datatypes::NoteTypeValue; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beat_unit_dot.rs b/musicxml/src/elements/beat_unit_dot.rs index 4f72386..fe044e4 100644 --- a/musicxml/src/elements/beat_unit_dot.rs +++ b/musicxml/src/elements/beat_unit_dot.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beat_unit_tied.rs b/musicxml/src/elements/beat_unit_tied.rs index 6fa7eba..8ebc2e6 100644 --- a/musicxml/src/elements/beat_unit_tied.rs +++ b/musicxml/src/elements/beat_unit_tied.rs @@ -1,4 +1,5 @@ use super::{BeatUnit, BeatUnitDot}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beater.rs b/musicxml/src/elements/beater.rs index efaa142..7b9f436 100644 --- a/musicxml/src/elements/beater.rs +++ b/musicxml/src/elements/beater.rs @@ -1,4 +1,5 @@ use crate::datatypes::{BeaterValue, TipDirection}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/beats.rs b/musicxml/src/elements/beats.rs index 4139c7c..6e8d3a1 100644 --- a/musicxml/src/elements/beats.rs +++ b/musicxml/src/elements/beats.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bend.rs b/musicxml/src/elements/bend.rs index ac969e7..c42f440 100644 --- a/musicxml/src/elements/bend.rs +++ b/musicxml/src/elements/bend.rs @@ -2,6 +2,7 @@ use super::{BendAlter, PreBend, Release, WithBar}; use crate::datatypes::{ BendShape, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, Tenths, TrillBeats, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bend_alter.rs b/musicxml/src/elements/bend_alter.rs index 47962bf..ab1837b 100644 --- a/musicxml/src/elements/bend_alter.rs +++ b/musicxml/src/elements/bend_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::Semitones; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bookmark.rs b/musicxml/src/elements/bookmark.rs index 1f765d6..6e0fb91 100644 --- a/musicxml/src/elements/bookmark.rs +++ b/musicxml/src/elements/bookmark.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Id, NmToken, PositiveInteger, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bottom_margin.rs b/musicxml/src/elements/bottom_margin.rs index a0da54a..e9c3399 100644 --- a/musicxml/src/elements/bottom_margin.rs +++ b/musicxml/src/elements/bottom_margin.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/bracket.rs b/musicxml/src/elements/bracket.rs index d8888a9..0227ab0 100644 --- a/musicxml/src/elements/bracket.rs +++ b/musicxml/src/elements/bracket.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, Id, LineEnd, LineType, NumberLevel, StartStopContinue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/brass_bend.rs b/musicxml/src/elements/brass_bend.rs index 15ff253..1d3a75f 100644 --- a/musicxml/src/elements/brass_bend.rs +++ b/musicxml/src/elements/brass_bend.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/breath_mark.rs b/musicxml/src/elements/breath_mark.rs index 5fcec9d..c587e58 100644 --- a/musicxml/src/elements/breath_mark.rs +++ b/musicxml/src/elements/breath_mark.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, BreathMarkValue, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/caesura.rs b/musicxml/src/elements/caesura.rs index 026a423..4a957dd 100644 --- a/musicxml/src/elements/caesura.rs +++ b/musicxml/src/elements/caesura.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, CaesuraValue, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/cancel.rs b/musicxml/src/elements/cancel.rs index 23b5847..8464c5b 100644 --- a/musicxml/src/elements/cancel.rs +++ b/musicxml/src/elements/cancel.rs @@ -1,4 +1,5 @@ use crate::datatypes::{CancelLocation, Fifths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/capo.rs b/musicxml/src/elements/capo.rs index 063e610..354b340 100644 --- a/musicxml/src/elements/capo.rs +++ b/musicxml/src/elements/capo.rs @@ -1,4 +1,5 @@ use crate::datatypes::NonNegativeInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/chord.rs b/musicxml/src/elements/chord.rs index da7511b..d8cb9cf 100644 --- a/musicxml/src/elements/chord.rs +++ b/musicxml/src/elements/chord.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/chromatic.rs b/musicxml/src/elements/chromatic.rs index b0071d4..02edac6 100644 --- a/musicxml/src/elements/chromatic.rs +++ b/musicxml/src/elements/chromatic.rs @@ -1,4 +1,5 @@ use crate::datatypes::Semitones; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/circular_arrow.rs b/musicxml/src/elements/circular_arrow.rs index c8b7767..d64cb7e 100644 --- a/musicxml/src/elements/circular_arrow.rs +++ b/musicxml/src/elements/circular_arrow.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/clef.rs b/musicxml/src/elements/clef.rs index 8ef0195..779d286 100644 --- a/musicxml/src/elements/clef.rs +++ b/musicxml/src/elements/clef.rs @@ -2,6 +2,7 @@ use super::{ClefOctaveChange, Line, Sign}; use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, StaffNumber, SymbolSize, Tenths, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/clef_octave_change.rs b/musicxml/src/elements/clef_octave_change.rs index b10aecc..dab6d47 100644 --- a/musicxml/src/elements/clef_octave_change.rs +++ b/musicxml/src/elements/clef_octave_change.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/coda.rs b/musicxml/src/elements/coda.rs index 062bb56..86e8823 100644 --- a/musicxml/src/elements/coda.rs +++ b/musicxml/src/elements/coda.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, SmuflCodaGlyphName, Tenths, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/concert_score.rs b/musicxml/src/elements/concert_score.rs index af0ed37..df83cc2 100644 --- a/musicxml/src/elements/concert_score.rs +++ b/musicxml/src/elements/concert_score.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/creator.rs b/musicxml/src/elements/creator.rs index f7837ae..7ee8a59 100644 --- a/musicxml/src/elements/creator.rs +++ b/musicxml/src/elements/creator.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/credit.rs b/musicxml/src/elements/credit.rs index a6656a6..ca5ffc9 100644 --- a/musicxml/src/elements/credit.rs +++ b/musicxml/src/elements/credit.rs @@ -1,5 +1,6 @@ use super::{Bookmark, CreditImage, CreditSymbol, CreditType, CreditWords, Link}; use crate::datatypes::{Id, PositiveInteger}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/credit_image.rs b/musicxml/src/elements/credit_image.rs index 3a44e0f..89bcd70 100644 --- a/musicxml/src/elements/credit_image.rs +++ b/musicxml/src/elements/credit_image.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AnyUri, Id, LeftCenterRight, Tenths, Token, ValignImage}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/credit_symbol.rs b/musicxml/src/elements/credit_symbol.rs index 7b69308..4749154 100644 --- a/musicxml/src/elements/credit_symbol.rs +++ b/musicxml/src/elements/credit_symbol.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, SmuflGlyphName, Tenths, TextDirection, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/credit_type.rs b/musicxml/src/elements/credit_type.rs index f1bbe1a..21a0545 100644 --- a/musicxml/src/elements/credit_type.rs +++ b/musicxml/src/elements/credit_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/credit_words.rs b/musicxml/src/elements/credit_words.rs index 0bcd7fb..cac5f88 100644 --- a/musicxml/src/elements/credit_words.rs +++ b/musicxml/src/elements/credit_words.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, Tenths, TextDirection, Valign, XmlLang, XmlSpace, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/cue.rs b/musicxml/src/elements/cue.rs index 0892404..ab52a55 100644 --- a/musicxml/src/elements/cue.rs +++ b/musicxml/src/elements/cue.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/damp.rs b/musicxml/src/elements/damp.rs index e6dfc39..c57aa86 100644 --- a/musicxml/src/elements/damp.rs +++ b/musicxml/src/elements/damp.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/damp_all.rs b/musicxml/src/elements/damp_all.rs index ec56f54..b6ef0c6 100644 --- a/musicxml/src/elements/damp_all.rs +++ b/musicxml/src/elements/damp_all.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/dashes.rs b/musicxml/src/elements/dashes.rs index 739891e..fbe5b6e 100644 --- a/musicxml/src/elements/dashes.rs +++ b/musicxml/src/elements/dashes.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, Id, NumberLevel, StartStopContinue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/defaults.rs b/musicxml/src/elements/defaults.rs index 3c62073..63bf96f 100644 --- a/musicxml/src/elements/defaults.rs +++ b/musicxml/src/elements/defaults.rs @@ -2,6 +2,7 @@ use super::{ Appearance, ConcertScore, LyricFont, LyricLanguage, MusicFont, PageLayout, Scaling, StaffLayout, SystemLayout, WordFont, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/degree.rs b/musicxml/src/elements/degree.rs index b6d07df..85c95f1 100644 --- a/musicxml/src/elements/degree.rs +++ b/musicxml/src/elements/degree.rs @@ -1,5 +1,6 @@ use super::{DegreeAlter, DegreeType, DegreeValue}; use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/degree_alter.rs b/musicxml/src/elements/degree_alter.rs index 6ca5174..0d5f77c 100644 --- a/musicxml/src/elements/degree_alter.rs +++ b/musicxml/src/elements/degree_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Semitones, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/degree_type.rs b/musicxml/src/elements/degree_type.rs index 0f7a352..85561bb 100644 --- a/musicxml/src/elements/degree_type.rs +++ b/musicxml/src/elements/degree_type.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, DegreeTypeValue, FontFamily, FontSize, FontStyle, FontWeight, Tenths, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/degree_value.rs b/musicxml/src/elements/degree_value.rs index c451f84..8648fee 100644 --- a/musicxml/src/elements/degree_value.rs +++ b/musicxml/src/elements/degree_value.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, DegreeSymbolValue, FontFamily, FontSize, FontStyle, FontWeight, PositiveInteger, Tenths, Token, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/delayed_inverted_turn.rs b/musicxml/src/elements/delayed_inverted_turn.rs index 0649df1..f72641f 100644 --- a/musicxml/src/elements/delayed_inverted_turn.rs +++ b/musicxml/src/elements/delayed_inverted_turn.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/delayed_turn.rs b/musicxml/src/elements/delayed_turn.rs index c2e4c97..1c90d71 100644 --- a/musicxml/src/elements/delayed_turn.rs +++ b/musicxml/src/elements/delayed_turn.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/detached_legato.rs b/musicxml/src/elements/detached_legato.rs index c114905..2836937 100644 --- a/musicxml/src/elements/detached_legato.rs +++ b/musicxml/src/elements/detached_legato.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/diatonic.rs b/musicxml/src/elements/diatonic.rs index 28ac0eb..3213bf9 100644 --- a/musicxml/src/elements/diatonic.rs +++ b/musicxml/src/elements/diatonic.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/direction.rs b/musicxml/src/elements/direction.rs index 299e88e..b41ac0b 100644 --- a/musicxml/src/elements/direction.rs +++ b/musicxml/src/elements/direction.rs @@ -1,5 +1,6 @@ use super::{DirectionType, Footnote, Level, Listening, Offset, Sound, Staff, Voice}; use crate::datatypes::{AboveBelow, Id, SystemRelation, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/direction_type.rs b/musicxml/src/elements/direction_type.rs index 12c1ee6..e34e699 100644 --- a/musicxml/src/elements/direction_type.rs +++ b/musicxml/src/elements/direction_type.rs @@ -4,6 +4,7 @@ use super::{ StringMute, Symbol, Wedge, Words, }; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/directive.rs b/musicxml/src/elements/directive.rs index d366474..abfc929 100644 --- a/musicxml/src/elements/directive.rs +++ b/musicxml/src/elements/directive.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths, XmlLang}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/display_octave.rs b/musicxml/src/elements/display_octave.rs index ba9fb5a..9c1a311 100644 --- a/musicxml/src/elements/display_octave.rs +++ b/musicxml/src/elements/display_octave.rs @@ -1,4 +1,5 @@ use crate::datatypes::Octave; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/display_step.rs b/musicxml/src/elements/display_step.rs index fdfb5c5..616e6b3 100644 --- a/musicxml/src/elements/display_step.rs +++ b/musicxml/src/elements/display_step.rs @@ -1,4 +1,5 @@ use crate::datatypes::Step; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/display_text.rs b/musicxml/src/elements/display_text.rs index d67dc28..38f58d9 100644 --- a/musicxml/src/elements/display_text.rs +++ b/musicxml/src/elements/display_text.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, Tenths, TextDirection, Valign, XmlLang, XmlSpace, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/distance.rs b/musicxml/src/elements/distance.rs index 353b4de..cc4b377 100644 --- a/musicxml/src/elements/distance.rs +++ b/musicxml/src/elements/distance.rs @@ -1,4 +1,5 @@ use crate::datatypes::{DistanceType, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/divisions.rs b/musicxml/src/elements/divisions.rs index 29856fa..de7e149 100644 --- a/musicxml/src/elements/divisions.rs +++ b/musicxml/src/elements/divisions.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveDivisions; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/doit.rs b/musicxml/src/elements/doit.rs index 750580d..b5af7b2 100644 --- a/musicxml/src/elements/doit.rs +++ b/musicxml/src/elements/doit.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, LineLength, LineShape, LineType, Tenths, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/dot.rs b/musicxml/src/elements/dot.rs index 0185871..814b36e 100644 --- a/musicxml/src/elements/dot.rs +++ b/musicxml/src/elements/dot.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/double.rs b/musicxml/src/elements/double.rs index 2724df8..6b1edce 100644 --- a/musicxml/src/elements/double.rs +++ b/musicxml/src/elements/double.rs @@ -1,4 +1,5 @@ use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/double_tongue.rs b/musicxml/src/elements/double_tongue.rs index 8c438e9..c93d4a8 100644 --- a/musicxml/src/elements/double_tongue.rs +++ b/musicxml/src/elements/double_tongue.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/down_bow.rs b/musicxml/src/elements/down_bow.rs index bca736a..8375475 100644 --- a/musicxml/src/elements/down_bow.rs +++ b/musicxml/src/elements/down_bow.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/duration.rs b/musicxml/src/elements/duration.rs index e282fbe..b718c3c 100644 --- a/musicxml/src/elements/duration.rs +++ b/musicxml/src/elements/duration.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveDivisions; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/dynamics.rs b/musicxml/src/elements/dynamics.rs index db083a7..7873d63 100644 --- a/musicxml/src/elements/dynamics.rs +++ b/musicxml/src/elements/dynamics.rs @@ -6,6 +6,7 @@ use crate::datatypes::{ AboveBelow, Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, NumberOfLines, Tenths, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/effect.rs b/musicxml/src/elements/effect.rs index 29bf20e..d0fa2f6 100644 --- a/musicxml/src/elements/effect.rs +++ b/musicxml/src/elements/effect.rs @@ -1,4 +1,5 @@ use crate::datatypes::{EffectValue, SmuflPictogramGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/elevation.rs b/musicxml/src/elements/elevation.rs index 81b7a08..1be7426 100644 --- a/musicxml/src/elements/elevation.rs +++ b/musicxml/src/elements/elevation.rs @@ -1,4 +1,5 @@ use crate::datatypes::RotationDegrees; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/elision.rs b/musicxml/src/elements/elision.rs index 4cf5ea3..b17c2a3 100644 --- a/musicxml/src/elements/elision.rs +++ b/musicxml/src/elements/elision.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflLyricsGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/encoder.rs b/musicxml/src/elements/encoder.rs index 693d65d..4f0e711 100644 --- a/musicxml/src/elements/encoder.rs +++ b/musicxml/src/elements/encoder.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/encoding.rs b/musicxml/src/elements/encoding.rs index e7dcdd3..d7a4217 100644 --- a/musicxml/src/elements/encoding.rs +++ b/musicxml/src/elements/encoding.rs @@ -1,4 +1,5 @@ use super::{Encoder, EncodingDate, EncodingDescription, Software, Supports}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/encoding_date.rs b/musicxml/src/elements/encoding_date.rs index f584582..4e31d51 100644 --- a/musicxml/src/elements/encoding_date.rs +++ b/musicxml/src/elements/encoding_date.rs @@ -1,4 +1,5 @@ use crate::datatypes::YyyyMmDd; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/encoding_description.rs b/musicxml/src/elements/encoding_description.rs index f1d977f..ec1fa3e 100644 --- a/musicxml/src/elements/encoding_description.rs +++ b/musicxml/src/elements/encoding_description.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/end_line.rs b/musicxml/src/elements/end_line.rs index c894cc7..540f46e 100644 --- a/musicxml/src/elements/end_line.rs +++ b/musicxml/src/elements/end_line.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/end_paragraph.rs b/musicxml/src/elements/end_paragraph.rs index 3bb4aa6..1f4b0c1 100644 --- a/musicxml/src/elements/end_paragraph.rs +++ b/musicxml/src/elements/end_paragraph.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ending.rs b/musicxml/src/elements/ending.rs index c2331c0..9a4fdc5 100644 --- a/musicxml/src/elements/ending.rs +++ b/musicxml/src/elements/ending.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, EndingNumber, FontFamily, FontSize, FontStyle, FontWeight, StartStopDiscontinue, SystemRelation, Tenths, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ensemble.rs b/musicxml/src/elements/ensemble.rs index 79f21d6..0e469ff 100644 --- a/musicxml/src/elements/ensemble.rs +++ b/musicxml/src/elements/ensemble.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveIntegerOrEmpty; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/except_voice.rs b/musicxml/src/elements/except_voice.rs index 15bb73c..dfab135 100644 --- a/musicxml/src/elements/except_voice.rs +++ b/musicxml/src/elements/except_voice.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/extend.rs b/musicxml/src/elements/extend.rs index e9de790..60ed044 100644 --- a/musicxml/src/elements/extend.rs +++ b/musicxml/src/elements/extend.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, StartStopContinue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/eyeglasses.rs b/musicxml/src/elements/eyeglasses.rs index b46fcaf..2b2b21f 100644 --- a/musicxml/src/elements/eyeglasses.rs +++ b/musicxml/src/elements/eyeglasses.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/f.rs b/musicxml/src/elements/f.rs index 9ee3808..1393879 100644 --- a/musicxml/src/elements/f.rs +++ b/musicxml/src/elements/f.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/falloff.rs b/musicxml/src/elements/falloff.rs index 3ddb995..b75f36a 100644 --- a/musicxml/src/elements/falloff.rs +++ b/musicxml/src/elements/falloff.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, LineLength, LineShape, LineType, Tenths, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/feature.rs b/musicxml/src/elements/feature.rs index 1fa75b2..0d9dc15 100644 --- a/musicxml/src/elements/feature.rs +++ b/musicxml/src/elements/feature.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fermata.rs b/musicxml/src/elements/fermata.rs index 777ebe6..d133263 100644 --- a/musicxml/src/elements/fermata.rs +++ b/musicxml/src/elements/fermata.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FermataShape, FontFamily, FontSize, FontStyle, FontWeight, Id, Tenths, UprightInverted}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ff.rs b/musicxml/src/elements/ff.rs index 15f4395..a78b4b8 100644 --- a/musicxml/src/elements/ff.rs +++ b/musicxml/src/elements/ff.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fff.rs b/musicxml/src/elements/fff.rs index fc85254..85bb2a9 100644 --- a/musicxml/src/elements/fff.rs +++ b/musicxml/src/elements/fff.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ffff.rs b/musicxml/src/elements/ffff.rs index 16fe01d..6173d3f 100644 --- a/musicxml/src/elements/ffff.rs +++ b/musicxml/src/elements/ffff.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fffff.rs b/musicxml/src/elements/fffff.rs index a8c8146..007624b 100644 --- a/musicxml/src/elements/fffff.rs +++ b/musicxml/src/elements/fffff.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ffffff.rs b/musicxml/src/elements/ffffff.rs index 18c0d24..d86c34e 100644 --- a/musicxml/src/elements/ffffff.rs +++ b/musicxml/src/elements/ffffff.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fifths.rs b/musicxml/src/elements/fifths.rs index b794cc5..5801c23 100644 --- a/musicxml/src/elements/fifths.rs +++ b/musicxml/src/elements/fifths.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/figure.rs b/musicxml/src/elements/figure.rs index 15e7475..05d8085 100644 --- a/musicxml/src/elements/figure.rs +++ b/musicxml/src/elements/figure.rs @@ -1,4 +1,5 @@ use super::{Extend, FigureNumber, Footnote, Level, Prefix, Suffix}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/figure_number.rs b/musicxml/src/elements/figure_number.rs index a1798a2..47f94ca 100644 --- a/musicxml/src/elements/figure_number.rs +++ b/musicxml/src/elements/figure_number.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/figured_bass.rs b/musicxml/src/elements/figured_bass.rs index 06ec6ce..1b572f6 100644 --- a/musicxml/src/elements/figured_bass.rs +++ b/musicxml/src/elements/figured_bass.rs @@ -2,6 +2,7 @@ use super::{Duration, Figure, Footnote, Level}; use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fingering.rs b/musicxml/src/elements/fingering.rs index e99249f..d5ef802 100644 --- a/musicxml/src/elements/fingering.rs +++ b/musicxml/src/elements/fingering.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fingernails.rs b/musicxml/src/elements/fingernails.rs index 53f8279..ea15031 100644 --- a/musicxml/src/elements/fingernails.rs +++ b/musicxml/src/elements/fingernails.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/first.rs b/musicxml/src/elements/first.rs index 391a46f..ba3d233 100644 --- a/musicxml/src/elements/first.rs +++ b/musicxml/src/elements/first.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/first_fret.rs b/musicxml/src/elements/first_fret.rs index 9863d5c..3949b79 100644 --- a/musicxml/src/elements/first_fret.rs +++ b/musicxml/src/elements/first_fret.rs @@ -1,4 +1,5 @@ use crate::datatypes::{LeftRight, PositiveInteger, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/flip.rs b/musicxml/src/elements/flip.rs index c12de3a..10b0161 100644 --- a/musicxml/src/elements/flip.rs +++ b/musicxml/src/elements/flip.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/footnote.rs b/musicxml/src/elements/footnote.rs index 4b772e7..8cf8d0a 100644 --- a/musicxml/src/elements/footnote.rs +++ b/musicxml/src/elements/footnote.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, Tenths, TextDirection, Valign, XmlLang, XmlSpace, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/for_part.rs b/musicxml/src/elements/for_part.rs index a996cd9..bca4417 100644 --- a/musicxml/src/elements/for_part.rs +++ b/musicxml/src/elements/for_part.rs @@ -1,5 +1,6 @@ use super::{PartClef, PartTranspose}; use crate::datatypes::{Id, StaffNumber}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/forward.rs b/musicxml/src/elements/forward.rs index c442b45..d7819ff 100644 --- a/musicxml/src/elements/forward.rs +++ b/musicxml/src/elements/forward.rs @@ -1,4 +1,5 @@ use super::{Duration, Footnote, Level, Staff, Voice}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fp.rs b/musicxml/src/elements/fp.rs index 161c6de..a27230b 100644 --- a/musicxml/src/elements/fp.rs +++ b/musicxml/src/elements/fp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/frame.rs b/musicxml/src/elements/frame.rs index e1e45d3..952b011 100644 --- a/musicxml/src/elements/frame.rs +++ b/musicxml/src/elements/frame.rs @@ -1,5 +1,6 @@ use super::{FirstFret, FrameFrets, FrameNote, FrameStrings}; use crate::datatypes::{Color, Id, LeftCenterRight, Tenths, Token, Valign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/frame_frets.rs b/musicxml/src/elements/frame_frets.rs index 3026b7d..1c7c2de 100644 --- a/musicxml/src/elements/frame_frets.rs +++ b/musicxml/src/elements/frame_frets.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/frame_note.rs b/musicxml/src/elements/frame_note.rs index e725cb1..8d2b216 100644 --- a/musicxml/src/elements/frame_note.rs +++ b/musicxml/src/elements/frame_note.rs @@ -1,4 +1,5 @@ use super::{Barre, Fingering, Fret, StringNumber}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/frame_strings.rs b/musicxml/src/elements/frame_strings.rs index 0c22abf..0e78b72 100644 --- a/musicxml/src/elements/frame_strings.rs +++ b/musicxml/src/elements/frame_strings.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fret.rs b/musicxml/src/elements/fret.rs index fd8d8ab..3206c42 100644 --- a/musicxml/src/elements/fret.rs +++ b/musicxml/src/elements/fret.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, NonNegativeInteger}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/function.rs b/musicxml/src/elements/function.rs index 1d0f435..57bb9f9 100644 --- a/musicxml/src/elements/function.rs +++ b/musicxml/src/elements/function.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/fz.rs b/musicxml/src/elements/fz.rs index 8336acb..29dd3c6 100644 --- a/musicxml/src/elements/fz.rs +++ b/musicxml/src/elements/fz.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/glass.rs b/musicxml/src/elements/glass.rs index 2755436..d0d7f8f 100644 --- a/musicxml/src/elements/glass.rs +++ b/musicxml/src/elements/glass.rs @@ -1,4 +1,5 @@ use crate::datatypes::{GlassValue, SmuflPictogramGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/glissando.rs b/musicxml/src/elements/glissando.rs index a50d5af..f15fa30 100644 --- a/musicxml/src/elements/glissando.rs +++ b/musicxml/src/elements/glissando.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LineType, NumberLevel, StartStop, Tenths, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/glyph.rs b/musicxml/src/elements/glyph.rs index 730d07d..948e917 100644 --- a/musicxml/src/elements/glyph.rs +++ b/musicxml/src/elements/glyph.rs @@ -1,4 +1,5 @@ use crate::datatypes::{GlyphType, SmuflGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/golpe.rs b/musicxml/src/elements/golpe.rs index 1131fba..2bfd1b0 100644 --- a/musicxml/src/elements/golpe.rs +++ b/musicxml/src/elements/golpe.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/grace.rs b/musicxml/src/elements/grace.rs index fe49d65..b4f9a0c 100644 --- a/musicxml/src/elements/grace.rs +++ b/musicxml/src/elements/grace.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Divisions, Percent, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group.rs b/musicxml/src/elements/group.rs index 0ca937e..f6aac92 100644 --- a/musicxml/src/elements/group.rs +++ b/musicxml/src/elements/group.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_abbreviation.rs b/musicxml/src/elements/group_abbreviation.rs index d0221ef..c1e0724 100644 --- a/musicxml/src/elements/group_abbreviation.rs +++ b/musicxml/src/elements/group_abbreviation.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_abbreviation_display.rs b/musicxml/src/elements/group_abbreviation_display.rs index 4221b74..e71e1e7 100644 --- a/musicxml/src/elements/group_abbreviation_display.rs +++ b/musicxml/src/elements/group_abbreviation_display.rs @@ -1,5 +1,6 @@ use super::{AccidentalText, DisplayText}; use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_barline.rs b/musicxml/src/elements/group_barline.rs index c334408..b6a779d 100644 --- a/musicxml/src/elements/group_barline.rs +++ b/musicxml/src/elements/group_barline.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, GroupBarlineValue}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_link.rs b/musicxml/src/elements/group_link.rs index c8fb308..222c8ff 100644 --- a/musicxml/src/elements/group_link.rs +++ b/musicxml/src/elements/group_link.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_name.rs b/musicxml/src/elements/group_name.rs index f51271f..b498005 100644 --- a/musicxml/src/elements/group_name.rs +++ b/musicxml/src/elements/group_name.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_name_display.rs b/musicxml/src/elements/group_name_display.rs index 70defcc..f3cdd42 100644 --- a/musicxml/src/elements/group_name_display.rs +++ b/musicxml/src/elements/group_name_display.rs @@ -1,5 +1,6 @@ use super::{AccidentalText, DisplayText}; use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_symbol.rs b/musicxml/src/elements/group_symbol.rs index 5aad808..25a8f5c 100644 --- a/musicxml/src/elements/group_symbol.rs +++ b/musicxml/src/elements/group_symbol.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, GroupSymbolValue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/group_time.rs b/musicxml/src/elements/group_time.rs index cedf7d1..3ac0b08 100644 --- a/musicxml/src/elements/group_time.rs +++ b/musicxml/src/elements/group_time.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/grouping.rs b/musicxml/src/elements/grouping.rs index b3083c6..8c8fb34 100644 --- a/musicxml/src/elements/grouping.rs +++ b/musicxml/src/elements/grouping.rs @@ -1,5 +1,6 @@ use super::Feature; use crate::datatypes::{Id, StartStopSingle, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/half_muted.rs b/musicxml/src/elements/half_muted.rs index 2715be7..d73600e 100644 --- a/musicxml/src/elements/half_muted.rs +++ b/musicxml/src/elements/half_muted.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/hammer_on.rs b/musicxml/src/elements/hammer_on.rs index 184a3df..0c2eaa8 100644 --- a/musicxml/src/elements/hammer_on.rs +++ b/musicxml/src/elements/hammer_on.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, NumberLevel, StartStop, Tenths, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/handbell.rs b/musicxml/src/elements/handbell.rs index 64f417a..cee9f5c 100644 --- a/musicxml/src/elements/handbell.rs +++ b/musicxml/src/elements/handbell.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, HandbellValue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/harmon_closed.rs b/musicxml/src/elements/harmon_closed.rs index 331b7e2..baf3c5d 100644 --- a/musicxml/src/elements/harmon_closed.rs +++ b/musicxml/src/elements/harmon_closed.rs @@ -1,4 +1,5 @@ use crate::datatypes::{HarmonClosedLocation, HarmonClosedValue}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/harmon_mute.rs b/musicxml/src/elements/harmon_mute.rs index cec3523..42190dd 100644 --- a/musicxml/src/elements/harmon_mute.rs +++ b/musicxml/src/elements/harmon_mute.rs @@ -1,5 +1,6 @@ use super::HarmonClosed; use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/harmonic.rs b/musicxml/src/elements/harmonic.rs index 13b111f..52a0e32 100644 --- a/musicxml/src/elements/harmonic.rs +++ b/musicxml/src/elements/harmonic.rs @@ -1,5 +1,6 @@ use super::{Artificial, BasePitch, Natural, SoundingPitch, TouchingPitch}; use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/harmony.rs b/musicxml/src/elements/harmony.rs index 6862485..9b528c3 100644 --- a/musicxml/src/elements/harmony.rs +++ b/musicxml/src/elements/harmony.rs @@ -5,6 +5,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, HarmonyArrangement, HarmonyType, Id, KindValue, SystemRelation, Tenths, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/harp_pedals.rs b/musicxml/src/elements/harp_pedals.rs index 341ddaf..f91f4a0 100644 --- a/musicxml/src/elements/harp_pedals.rs +++ b/musicxml/src/elements/harp_pedals.rs @@ -1,5 +1,6 @@ use super::PedalTuning; use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/haydn.rs b/musicxml/src/elements/haydn.rs index ecb45e5..55e9733 100644 --- a/musicxml/src/elements/haydn.rs +++ b/musicxml/src/elements/haydn.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/heel.rs b/musicxml/src/elements/heel.rs index afb5fe4..3ef15a9 100644 --- a/musicxml/src/elements/heel.rs +++ b/musicxml/src/elements/heel.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/hole.rs b/musicxml/src/elements/hole.rs index b662ed9..a71bbab 100644 --- a/musicxml/src/elements/hole.rs +++ b/musicxml/src/elements/hole.rs @@ -1,5 +1,6 @@ use super::{HoleClosed, HoleShape, HoleType}; use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/hole_closed.rs b/musicxml/src/elements/hole_closed.rs index 9b57433..1838553 100644 --- a/musicxml/src/elements/hole_closed.rs +++ b/musicxml/src/elements/hole_closed.rs @@ -1,4 +1,5 @@ use crate::datatypes::{HoleClosedLocation, HoleClosedValue}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/hole_shape.rs b/musicxml/src/elements/hole_shape.rs index 5164edf..3c60ca0 100644 --- a/musicxml/src/elements/hole_shape.rs +++ b/musicxml/src/elements/hole_shape.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/hole_type.rs b/musicxml/src/elements/hole_type.rs index 135fb21..f183035 100644 --- a/musicxml/src/elements/hole_type.rs +++ b/musicxml/src/elements/hole_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/humming.rs b/musicxml/src/elements/humming.rs index 128d178..e17036e 100644 --- a/musicxml/src/elements/humming.rs +++ b/musicxml/src/elements/humming.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/identification.rs b/musicxml/src/elements/identification.rs index 2a1e271..c5b7074 100644 --- a/musicxml/src/elements/identification.rs +++ b/musicxml/src/elements/identification.rs @@ -1,4 +1,5 @@ use super::{Creator, Encoding, Miscellaneous, Relation, Rights, Source}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/image.rs b/musicxml/src/elements/image.rs index 5677e48..54a0958 100644 --- a/musicxml/src/elements/image.rs +++ b/musicxml/src/elements/image.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AnyUri, Id, LeftCenterRight, Tenths, Token, Valign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/instrument.rs b/musicxml/src/elements/instrument.rs index be36d10..67a5ff7 100644 --- a/musicxml/src/elements/instrument.rs +++ b/musicxml/src/elements/instrument.rs @@ -1,4 +1,5 @@ use crate::datatypes::IdRef; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/instrument_abbreviation.rs b/musicxml/src/elements/instrument_abbreviation.rs index 6d81016..8f6b5b2 100644 --- a/musicxml/src/elements/instrument_abbreviation.rs +++ b/musicxml/src/elements/instrument_abbreviation.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/instrument_change.rs b/musicxml/src/elements/instrument_change.rs index 9ce004d..9f9f14b 100644 --- a/musicxml/src/elements/instrument_change.rs +++ b/musicxml/src/elements/instrument_change.rs @@ -1,5 +1,6 @@ use super::{Ensemble, InstrumentSound, Solo, VirtualInstrument}; use crate::datatypes::IdRef; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/instrument_link.rs b/musicxml/src/elements/instrument_link.rs index 19137e3..fff152a 100644 --- a/musicxml/src/elements/instrument_link.rs +++ b/musicxml/src/elements/instrument_link.rs @@ -1,4 +1,5 @@ use crate::datatypes::IdRef; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/instrument_name.rs b/musicxml/src/elements/instrument_name.rs index 8e1c401..dcc4c9e 100644 --- a/musicxml/src/elements/instrument_name.rs +++ b/musicxml/src/elements/instrument_name.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/instrument_sound.rs b/musicxml/src/elements/instrument_sound.rs index 6b3756d..5c32210 100644 --- a/musicxml/src/elements/instrument_sound.rs +++ b/musicxml/src/elements/instrument_sound.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/instruments.rs b/musicxml/src/elements/instruments.rs index 2ad3053..b3009bd 100644 --- a/musicxml/src/elements/instruments.rs +++ b/musicxml/src/elements/instruments.rs @@ -1,4 +1,5 @@ use crate::datatypes::NonNegativeInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/interchangeable.rs b/musicxml/src/elements/interchangeable.rs index 0216027..b6fe73b 100644 --- a/musicxml/src/elements/interchangeable.rs +++ b/musicxml/src/elements/interchangeable.rs @@ -1,5 +1,6 @@ use super::{BeatType, Beats, TimeRelation}; use crate::datatypes::{TimeSeparator, TimeSymbol}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/inversion.rs b/musicxml/src/elements/inversion.rs index 570a89d..de1e9d2 100644 --- a/musicxml/src/elements/inversion.rs +++ b/musicxml/src/elements/inversion.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, NonNegativeInteger, Tenths, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/inverted_mordent.rs b/musicxml/src/elements/inverted_mordent.rs index 30c3950..70cb846 100644 --- a/musicxml/src/elements/inverted_mordent.rs +++ b/musicxml/src/elements/inverted_mordent.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/inverted_turn.rs b/musicxml/src/elements/inverted_turn.rs index 3c12d72..1441c52 100644 --- a/musicxml/src/elements/inverted_turn.rs +++ b/musicxml/src/elements/inverted_turn.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/inverted_vertical_turn.rs b/musicxml/src/elements/inverted_vertical_turn.rs index c41ccf6..36384dd 100644 --- a/musicxml/src/elements/inverted_vertical_turn.rs +++ b/musicxml/src/elements/inverted_vertical_turn.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ipa.rs b/musicxml/src/elements/ipa.rs index 66a7fa9..b480904 100644 --- a/musicxml/src/elements/ipa.rs +++ b/musicxml/src/elements/ipa.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/key.rs b/musicxml/src/elements/key.rs index 33360c2..6bafbe9 100644 --- a/musicxml/src/elements/key.rs +++ b/musicxml/src/elements/key.rs @@ -1,5 +1,6 @@ use super::{Cancel, Fifths, KeyAccidental, KeyAlter, KeyOctave, KeyStep, Mode}; use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, StaffNumber, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/key_accidental.rs b/musicxml/src/elements/key_accidental.rs index 23d0c75..1076a11 100644 --- a/musicxml/src/elements/key_accidental.rs +++ b/musicxml/src/elements/key_accidental.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AccidentalValue, SmuflAccidentalGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/key_alter.rs b/musicxml/src/elements/key_alter.rs index 8be0c29..3475802 100644 --- a/musicxml/src/elements/key_alter.rs +++ b/musicxml/src/elements/key_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::Semitones; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/key_octave.rs b/musicxml/src/elements/key_octave.rs index 557ea48..c898bfc 100644 --- a/musicxml/src/elements/key_octave.rs +++ b/musicxml/src/elements/key_octave.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Octave, PositiveInteger, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/key_step.rs b/musicxml/src/elements/key_step.rs index cabaddc..49f87cb 100644 --- a/musicxml/src/elements/key_step.rs +++ b/musicxml/src/elements/key_step.rs @@ -1,4 +1,5 @@ use crate::datatypes::Step; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/kind.rs b/musicxml/src/elements/kind.rs index 8bca0d7..483f141 100644 --- a/musicxml/src/elements/kind.rs +++ b/musicxml/src/elements/kind.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, KindValue, LeftCenterRight, Tenths, Token, Valign, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/laughing.rs b/musicxml/src/elements/laughing.rs index 9a3978f..b61f5bb 100644 --- a/musicxml/src/elements/laughing.rs +++ b/musicxml/src/elements/laughing.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/left_divider.rs b/musicxml/src/elements/left_divider.rs index 3dea5cb..53d1f17 100644 --- a/musicxml/src/elements/left_divider.rs +++ b/musicxml/src/elements/left_divider.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, Tenths, Valign, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/left_margin.rs b/musicxml/src/elements/left_margin.rs index 82bc807..d848f7c 100644 --- a/musicxml/src/elements/left_margin.rs +++ b/musicxml/src/elements/left_margin.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/level.rs b/musicxml/src/elements/level.rs index d10173f..324cad4 100644 --- a/musicxml/src/elements/level.rs +++ b/musicxml/src/elements/level.rs @@ -1,4 +1,5 @@ use crate::datatypes::{StartStopSingle, SymbolSize, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/line.rs b/musicxml/src/elements/line.rs index 9bf6893..ce2adbd 100644 --- a/musicxml/src/elements/line.rs +++ b/musicxml/src/elements/line.rs @@ -1,4 +1,5 @@ use crate::datatypes::StaffLinePosition; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/line_detail.rs b/musicxml/src/elements/line_detail.rs index 1bca1d4..6cfbf7f 100644 --- a/musicxml/src/elements/line_detail.rs +++ b/musicxml/src/elements/line_detail.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, LineType, StaffLine, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/line_width.rs b/musicxml/src/elements/line_width.rs index e32dd6e..1331dc7 100644 --- a/musicxml/src/elements/line_width.rs +++ b/musicxml/src/elements/line_width.rs @@ -1,4 +1,5 @@ use crate::datatypes::{LineWidthType, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/link.rs b/musicxml/src/elements/link.rs index df9db17..99b146b 100644 --- a/musicxml/src/elements/link.rs +++ b/musicxml/src/elements/link.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AnyUri, NmToken, PositiveInteger, Tenths, Token, XlinkActuate, XlinkShow, XlinkType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/listen.rs b/musicxml/src/elements/listen.rs index bbeef5b..d430081 100644 --- a/musicxml/src/elements/listen.rs +++ b/musicxml/src/elements/listen.rs @@ -1,4 +1,5 @@ use super::{Assess, OtherListen, Wait}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/listening.rs b/musicxml/src/elements/listening.rs index a27fdcd..e011ae4 100644 --- a/musicxml/src/elements/listening.rs +++ b/musicxml/src/elements/listening.rs @@ -1,4 +1,5 @@ use super::{Offset, OtherListening, Sync}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/lyric.rs b/musicxml/src/elements/lyric.rs index 83544fc..142c851 100644 --- a/musicxml/src/elements/lyric.rs +++ b/musicxml/src/elements/lyric.rs @@ -1,5 +1,6 @@ use super::{Elision, EndLine, EndParagraph, Extend, Footnote, Humming, Laughing, Level, Syllabic, Text}; use crate::datatypes::{AboveBelow, Color, Id, LeftCenterRight, NmToken, Tenths, TimeOnly, Token, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/lyric_font.rs b/musicxml/src/elements/lyric_font.rs index cbb4135..8330500 100644 --- a/musicxml/src/elements/lyric_font.rs +++ b/musicxml/src/elements/lyric_font.rs @@ -1,4 +1,5 @@ use crate::datatypes::{FontFamily, FontSize, FontStyle, FontWeight, NmToken, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/lyric_language.rs b/musicxml/src/elements/lyric_language.rs index bae03f5..491cdbd 100644 --- a/musicxml/src/elements/lyric_language.rs +++ b/musicxml/src/elements/lyric_language.rs @@ -1,4 +1,5 @@ use crate::datatypes::{NmToken, Token, XmlLang}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/measure.rs b/musicxml/src/elements/measure.rs index fd2160a..7cf7e2a 100644 --- a/musicxml/src/elements/measure.rs +++ b/musicxml/src/elements/measure.rs @@ -3,6 +3,7 @@ use super::{ Part, Print, Sound, }; use crate::datatypes::{Id, MeasureText, Tenths, Token, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/measure_distance.rs b/musicxml/src/elements/measure_distance.rs index 7b7bff2..02ee02d 100644 --- a/musicxml/src/elements/measure_distance.rs +++ b/musicxml/src/elements/measure_distance.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/measure_layout.rs b/musicxml/src/elements/measure_layout.rs index 358c633..3a9eee1 100644 --- a/musicxml/src/elements/measure_layout.rs +++ b/musicxml/src/elements/measure_layout.rs @@ -1,4 +1,5 @@ use super::MeasureDistance; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/measure_numbering.rs b/musicxml/src/elements/measure_numbering.rs index a69eb33..b26d382 100644 --- a/musicxml/src/elements/measure_numbering.rs +++ b/musicxml/src/elements/measure_numbering.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, MeasureNumberingValue, StaffNumber, SystemRelationNumber, Tenths, Valign, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/measure_repeat.rs b/musicxml/src/elements/measure_repeat.rs index 6e3a411..abb6d06 100644 --- a/musicxml/src/elements/measure_repeat.rs +++ b/musicxml/src/elements/measure_repeat.rs @@ -1,4 +1,5 @@ use crate::datatypes::{PositiveInteger, PositiveIntegerOrEmpty, StartStop}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/measure_style.rs b/musicxml/src/elements/measure_style.rs index 04f6ef5..da714c8 100644 --- a/musicxml/src/elements/measure_style.rs +++ b/musicxml/src/elements/measure_style.rs @@ -1,5 +1,6 @@ use super::{BeatRepeat, MeasureRepeat, MultipleRest, Slash}; use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, StaffNumber}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/membrane.rs b/musicxml/src/elements/membrane.rs index 83c558f..0ae11ea 100644 --- a/musicxml/src/elements/membrane.rs +++ b/musicxml/src/elements/membrane.rs @@ -1,4 +1,5 @@ use crate::datatypes::{MembraneValue, SmuflPictogramGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metal.rs b/musicxml/src/elements/metal.rs index e25f29a..1932e3b 100644 --- a/musicxml/src/elements/metal.rs +++ b/musicxml/src/elements/metal.rs @@ -1,4 +1,5 @@ use crate::datatypes::{MetalValue, SmuflPictogramGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome.rs b/musicxml/src/elements/metronome.rs index 666b611..4d7cc89 100644 --- a/musicxml/src/elements/metronome.rs +++ b/musicxml/src/elements/metronome.rs @@ -2,6 +2,7 @@ use super::{BeatUnit, BeatUnitDot, BeatUnitTied, MetronomeArrows, MetronomeNote, use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_arrows.rs b/musicxml/src/elements/metronome_arrows.rs index e5e9c07..04c4153 100644 --- a/musicxml/src/elements/metronome_arrows.rs +++ b/musicxml/src/elements/metronome_arrows.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_beam.rs b/musicxml/src/elements/metronome_beam.rs index 5738b11..03cca5f 100644 --- a/musicxml/src/elements/metronome_beam.rs +++ b/musicxml/src/elements/metronome_beam.rs @@ -1,4 +1,5 @@ use crate::datatypes::{BeamLevel, BeamValue}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_dot.rs b/musicxml/src/elements/metronome_dot.rs index 646a002..80f3e02 100644 --- a/musicxml/src/elements/metronome_dot.rs +++ b/musicxml/src/elements/metronome_dot.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_note.rs b/musicxml/src/elements/metronome_note.rs index 1619514..9b81ed0 100644 --- a/musicxml/src/elements/metronome_note.rs +++ b/musicxml/src/elements/metronome_note.rs @@ -1,4 +1,5 @@ use super::{MetronomeBeam, MetronomeDot, MetronomeTied, MetronomeTuplet, MetronomeType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_relation.rs b/musicxml/src/elements/metronome_relation.rs index 1296463..d5b3e38 100644 --- a/musicxml/src/elements/metronome_relation.rs +++ b/musicxml/src/elements/metronome_relation.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_tied.rs b/musicxml/src/elements/metronome_tied.rs index abb32bd..560d487 100644 --- a/musicxml/src/elements/metronome_tied.rs +++ b/musicxml/src/elements/metronome_tied.rs @@ -1,4 +1,5 @@ use crate::datatypes::StartStop; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_tuplet.rs b/musicxml/src/elements/metronome_tuplet.rs index 83c2b77..a074f2d 100644 --- a/musicxml/src/elements/metronome_tuplet.rs +++ b/musicxml/src/elements/metronome_tuplet.rs @@ -1,5 +1,6 @@ use super::{ActualNotes, NormalDot, NormalNotes, NormalType}; use crate::datatypes::{ShowTuplet, StartStop, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/metronome_type.rs b/musicxml/src/elements/metronome_type.rs index 2b4961f..e548e09 100644 --- a/musicxml/src/elements/metronome_type.rs +++ b/musicxml/src/elements/metronome_type.rs @@ -1,4 +1,5 @@ use crate::datatypes::NoteTypeValue; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/mf.rs b/musicxml/src/elements/mf.rs index bf44c07..e3499a6 100644 --- a/musicxml/src/elements/mf.rs +++ b/musicxml/src/elements/mf.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/midi_bank.rs b/musicxml/src/elements/midi_bank.rs index 82ce16d..c08f401 100644 --- a/musicxml/src/elements/midi_bank.rs +++ b/musicxml/src/elements/midi_bank.rs @@ -1,4 +1,5 @@ use crate::datatypes::Midi16384; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/midi_channel.rs b/musicxml/src/elements/midi_channel.rs index 6083f77..f4a4e59 100644 --- a/musicxml/src/elements/midi_channel.rs +++ b/musicxml/src/elements/midi_channel.rs @@ -1,4 +1,5 @@ use crate::datatypes::Midi16; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/midi_device.rs b/musicxml/src/elements/midi_device.rs index efe8e0b..ab606ba 100644 --- a/musicxml/src/elements/midi_device.rs +++ b/musicxml/src/elements/midi_device.rs @@ -1,4 +1,5 @@ use crate::datatypes::{IdRef, Midi16}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/midi_instrument.rs b/musicxml/src/elements/midi_instrument.rs index 1fbbe95..5f00e72 100644 --- a/musicxml/src/elements/midi_instrument.rs +++ b/musicxml/src/elements/midi_instrument.rs @@ -1,5 +1,6 @@ use super::{Elevation, MidiBank, MidiChannel, MidiName, MidiProgram, MidiUnpitched, Pan, Volume}; use crate::datatypes::IdRef; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/midi_name.rs b/musicxml/src/elements/midi_name.rs index e32b0b7..07b466c 100644 --- a/musicxml/src/elements/midi_name.rs +++ b/musicxml/src/elements/midi_name.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/midi_program.rs b/musicxml/src/elements/midi_program.rs index 43ab3cc..2e1915d 100644 --- a/musicxml/src/elements/midi_program.rs +++ b/musicxml/src/elements/midi_program.rs @@ -1,4 +1,5 @@ use crate::datatypes::Midi128; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/midi_unpitched.rs b/musicxml/src/elements/midi_unpitched.rs index f52d56f..9f49287 100644 --- a/musicxml/src/elements/midi_unpitched.rs +++ b/musicxml/src/elements/midi_unpitched.rs @@ -1,4 +1,5 @@ use crate::datatypes::Midi128; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/millimeters.rs b/musicxml/src/elements/millimeters.rs index f69eb5c..77beb21 100644 --- a/musicxml/src/elements/millimeters.rs +++ b/musicxml/src/elements/millimeters.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/miscellaneous.rs b/musicxml/src/elements/miscellaneous.rs index d0277a1..9a0eeb6 100644 --- a/musicxml/src/elements/miscellaneous.rs +++ b/musicxml/src/elements/miscellaneous.rs @@ -1,4 +1,5 @@ use super::MiscellaneousField; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/miscellaneous_field.rs b/musicxml/src/elements/miscellaneous_field.rs index 8760b00..a928129 100644 --- a/musicxml/src/elements/miscellaneous_field.rs +++ b/musicxml/src/elements/miscellaneous_field.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/mode.rs b/musicxml/src/elements/mode.rs index 8224a2a..7afbc08 100644 --- a/musicxml/src/elements/mode.rs +++ b/musicxml/src/elements/mode.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/mordent.rs b/musicxml/src/elements/mordent.rs index 00671ba..f2ac11f 100644 --- a/musicxml/src/elements/mordent.rs +++ b/musicxml/src/elements/mordent.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/movement_number.rs b/musicxml/src/elements/movement_number.rs index 6d6722e..f17e4c2 100644 --- a/musicxml/src/elements/movement_number.rs +++ b/musicxml/src/elements/movement_number.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/movement_title.rs b/musicxml/src/elements/movement_title.rs index 24cf3b9..45949ab 100644 --- a/musicxml/src/elements/movement_title.rs +++ b/musicxml/src/elements/movement_title.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/mp.rs b/musicxml/src/elements/mp.rs index b243648..1355a46 100644 --- a/musicxml/src/elements/mp.rs +++ b/musicxml/src/elements/mp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/multiple_rest.rs b/musicxml/src/elements/multiple_rest.rs index 4635ee8..8b02ae4 100644 --- a/musicxml/src/elements/multiple_rest.rs +++ b/musicxml/src/elements/multiple_rest.rs @@ -1,4 +1,5 @@ use crate::datatypes::{PositiveInteger, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/music_font.rs b/musicxml/src/elements/music_font.rs index b065dd4..e6fdb1f 100644 --- a/musicxml/src/elements/music_font.rs +++ b/musicxml/src/elements/music_font.rs @@ -1,4 +1,5 @@ use crate::datatypes::{FontFamily, FontSize, FontStyle, FontWeight}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/mute.rs b/musicxml/src/elements/mute.rs index f73dc6a..2f3f0b7 100644 --- a/musicxml/src/elements/mute.rs +++ b/musicxml/src/elements/mute.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/n.rs b/musicxml/src/elements/n.rs index 496d6c0..ca71968 100644 --- a/musicxml/src/elements/n.rs +++ b/musicxml/src/elements/n.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/natural.rs b/musicxml/src/elements/natural.rs index c01d73b..6e412a0 100644 --- a/musicxml/src/elements/natural.rs +++ b/musicxml/src/elements/natural.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/non_arpeggiate.rs b/musicxml/src/elements/non_arpeggiate.rs index 8554fc6..6980792 100644 --- a/musicxml/src/elements/non_arpeggiate.rs +++ b/musicxml/src/elements/non_arpeggiate.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, Id, NumberLevel, Tenths, TopBottom}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/normal_dot.rs b/musicxml/src/elements/normal_dot.rs index 57fd30f..2b83f30 100644 --- a/musicxml/src/elements/normal_dot.rs +++ b/musicxml/src/elements/normal_dot.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/normal_notes.rs b/musicxml/src/elements/normal_notes.rs index 275231e..76eb4e3 100644 --- a/musicxml/src/elements/normal_notes.rs +++ b/musicxml/src/elements/normal_notes.rs @@ -1,4 +1,5 @@ use crate::datatypes::NonNegativeInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/normal_type.rs b/musicxml/src/elements/normal_type.rs index 1114bec..503e866 100644 --- a/musicxml/src/elements/normal_type.rs +++ b/musicxml/src/elements/normal_type.rs @@ -1,4 +1,5 @@ use crate::datatypes::NoteTypeValue; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/notations.rs b/musicxml/src/elements/notations.rs index 7f3cf76..8b9dc87 100644 --- a/musicxml/src/elements/notations.rs +++ b/musicxml/src/elements/notations.rs @@ -3,6 +3,7 @@ use super::{ OtherNotation, Slide, Slur, Technical, Tied, Tuplet, }; use crate::datatypes::{Id, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; @@ -168,6 +169,7 @@ pub struct Notations { mod notations_tests { use crate::elements::*; use crate::parser::parse_from_xml_str; + use alloc::string::String; #[test] fn deserialize_valid1() { diff --git a/musicxml/src/elements/note.rs b/musicxml/src/elements/note.rs index 98c06cc..5d83fd2 100644 --- a/musicxml/src/elements/note.rs +++ b/musicxml/src/elements/note.rs @@ -5,6 +5,7 @@ use super::{ use crate::datatypes::{ Color, Divisions, FontFamily, FontSize, FontStyle, FontWeight, Id, NonNegativeDecimal, Tenths, TimeOnly, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; @@ -569,6 +570,7 @@ mod note_tests { use crate::datatypes::StartStop; use crate::elements::*; use crate::parser::parse_from_xml_str; + use alloc::string::ToString; #[test] fn deserialize_valid1() { diff --git a/musicxml/src/elements/note_size.rs b/musicxml/src/elements/note_size.rs index 3494144..59ce328 100644 --- a/musicxml/src/elements/note_size.rs +++ b/musicxml/src/elements/note_size.rs @@ -1,4 +1,5 @@ use crate::datatypes::{NonNegativeDecimal, NoteSizeType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/notehead.rs b/musicxml/src/elements/notehead.rs index 1390fa7..80fcd4c 100644 --- a/musicxml/src/elements/notehead.rs +++ b/musicxml/src/elements/notehead.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, NoteheadValue, SmuflGlyphName, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/notehead_text.rs b/musicxml/src/elements/notehead_text.rs index da76e72..56637b6 100644 --- a/musicxml/src/elements/notehead_text.rs +++ b/musicxml/src/elements/notehead_text.rs @@ -1,4 +1,5 @@ use super::{AccidentalText, DisplayText}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/numeral.rs b/musicxml/src/elements/numeral.rs index da37442..96aa1e3 100644 --- a/musicxml/src/elements/numeral.rs +++ b/musicxml/src/elements/numeral.rs @@ -1,4 +1,5 @@ use super::{NumeralAlter, NumeralKey, NumeralRoot}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/numeral_alter.rs b/musicxml/src/elements/numeral_alter.rs index c4a17b2..8f100a6 100644 --- a/musicxml/src/elements/numeral_alter.rs +++ b/musicxml/src/elements/numeral_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftRight, Semitones, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/numeral_fifths.rs b/musicxml/src/elements/numeral_fifths.rs index 3bfcd35..c194862 100644 --- a/musicxml/src/elements/numeral_fifths.rs +++ b/musicxml/src/elements/numeral_fifths.rs @@ -1,4 +1,5 @@ use crate::datatypes::Fifths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/numeral_key.rs b/musicxml/src/elements/numeral_key.rs index 1365fe8..607e09a 100644 --- a/musicxml/src/elements/numeral_key.rs +++ b/musicxml/src/elements/numeral_key.rs @@ -1,5 +1,6 @@ use super::{NumeralFifths, NumeralMode}; use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/numeral_mode.rs b/musicxml/src/elements/numeral_mode.rs index e456f4b..5c270a7 100644 --- a/musicxml/src/elements/numeral_mode.rs +++ b/musicxml/src/elements/numeral_mode.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/numeral_root.rs b/musicxml/src/elements/numeral_root.rs index e49a7a6..bfe5283 100644 --- a/musicxml/src/elements/numeral_root.rs +++ b/musicxml/src/elements/numeral_root.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, NumeralValue, Tenths, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/octave.rs b/musicxml/src/elements/octave.rs index 33e294f..368cac4 100644 --- a/musicxml/src/elements/octave.rs +++ b/musicxml/src/elements/octave.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/octave_change.rs b/musicxml/src/elements/octave_change.rs index ded4bf8..c661a4b 100644 --- a/musicxml/src/elements/octave_change.rs +++ b/musicxml/src/elements/octave_change.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/octave_shift.rs b/musicxml/src/elements/octave_shift.rs index 1ff9fd0..a583ae8 100644 --- a/musicxml/src/elements/octave_shift.rs +++ b/musicxml/src/elements/octave_shift.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, NumberLevel, PositiveInteger, Tenths, UpDownStopContinue, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/offset.rs b/musicxml/src/elements/offset.rs index c156db8..ca34164 100644 --- a/musicxml/src/elements/offset.rs +++ b/musicxml/src/elements/offset.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Divisions, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/open.rs b/musicxml/src/elements/open.rs index c109b5a..455e87e 100644 --- a/musicxml/src/elements/open.rs +++ b/musicxml/src/elements/open.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/open_string.rs b/musicxml/src/elements/open_string.rs index a28551d..3598b72 100644 --- a/musicxml/src/elements/open_string.rs +++ b/musicxml/src/elements/open_string.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/opus.rs b/musicxml/src/elements/opus.rs index 241b021..f8c9361 100644 --- a/musicxml/src/elements/opus.rs +++ b/musicxml/src/elements/opus.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AnyUri, Token, XlinkActuate, XlinkShow, XlinkType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ornaments.rs b/musicxml/src/elements/ornaments.rs index fb69168..fab5bdb 100644 --- a/musicxml/src/elements/ornaments.rs +++ b/musicxml/src/elements/ornaments.rs @@ -3,6 +3,7 @@ use super::{ Mordent, OtherOrnament, Schleifer, Shake, Tremolo, TrillMark, Turn, VerticalTurn, WavyLine, }; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_appearance.rs b/musicxml/src/elements/other_appearance.rs index cabcb4d..e88e43a 100644 --- a/musicxml/src/elements/other_appearance.rs +++ b/musicxml/src/elements/other_appearance.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_articulation.rs b/musicxml/src/elements/other_articulation.rs index a153e7d..224e410 100644 --- a/musicxml/src/elements/other_articulation.rs +++ b/musicxml/src/elements/other_articulation.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_direction.rs b/musicxml/src/elements/other_direction.rs index 563866a..4e04d71 100644 --- a/musicxml/src/elements/other_direction.rs +++ b/musicxml/src/elements/other_direction.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, SmuflGlyphName, Tenths, Valign, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_dynamics.rs b/musicxml/src/elements/other_dynamics.rs index bfb3403..08f4338 100644 --- a/musicxml/src/elements/other_dynamics.rs +++ b/musicxml/src/elements/other_dynamics.rs @@ -1,4 +1,5 @@ use crate::datatypes::SmuflGlyphName; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_listen.rs b/musicxml/src/elements/other_listen.rs index 788d107..c933720 100644 --- a/musicxml/src/elements/other_listen.rs +++ b/musicxml/src/elements/other_listen.rs @@ -1,4 +1,5 @@ use crate::datatypes::{IdRef, TimeOnly, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_listening.rs b/musicxml/src/elements/other_listening.rs index fb3f96b..0594991 100644 --- a/musicxml/src/elements/other_listening.rs +++ b/musicxml/src/elements/other_listening.rs @@ -1,4 +1,5 @@ use crate::datatypes::{IdRef, TimeOnly, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_notation.rs b/musicxml/src/elements/other_notation.rs index 974a2fa..f224855 100644 --- a/musicxml/src/elements/other_notation.rs +++ b/musicxml/src/elements/other_notation.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Id, NumberLevel, SmuflGlyphName, StartStopSingle, Tenths, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_ornament.rs b/musicxml/src/elements/other_ornament.rs index b4b8292..60d31c4 100644 --- a/musicxml/src/elements/other_ornament.rs +++ b/musicxml/src/elements/other_ornament.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_percussion.rs b/musicxml/src/elements/other_percussion.rs index f57c0b0..015e930 100644 --- a/musicxml/src/elements/other_percussion.rs +++ b/musicxml/src/elements/other_percussion.rs @@ -1,4 +1,5 @@ use crate::datatypes::SmuflGlyphName; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_play.rs b/musicxml/src/elements/other_play.rs index b036006..c4164f9 100644 --- a/musicxml/src/elements/other_play.rs +++ b/musicxml/src/elements/other_play.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/other_technical.rs b/musicxml/src/elements/other_technical.rs index 93576b2..56d1212 100644 --- a/musicxml/src/elements/other_technical.rs +++ b/musicxml/src/elements/other_technical.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/p.rs b/musicxml/src/elements/p.rs index cda97dc..054f2e0 100644 --- a/musicxml/src/elements/p.rs +++ b/musicxml/src/elements/p.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/page_height.rs b/musicxml/src/elements/page_height.rs index bcea496..2617ca2 100644 --- a/musicxml/src/elements/page_height.rs +++ b/musicxml/src/elements/page_height.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/page_layout.rs b/musicxml/src/elements/page_layout.rs index 3537087..ddf5e62 100644 --- a/musicxml/src/elements/page_layout.rs +++ b/musicxml/src/elements/page_layout.rs @@ -1,4 +1,5 @@ use super::{PageHeight, PageMargins, PageWidth}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/page_margins.rs b/musicxml/src/elements/page_margins.rs index d0cce6d..204d228 100644 --- a/musicxml/src/elements/page_margins.rs +++ b/musicxml/src/elements/page_margins.rs @@ -1,5 +1,6 @@ use super::{BottomMargin, LeftMargin, RightMargin, TopMargin}; use crate::datatypes::MarginType; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/page_width.rs b/musicxml/src/elements/page_width.rs index c1c73ba..4a31eb6 100644 --- a/musicxml/src/elements/page_width.rs +++ b/musicxml/src/elements/page_width.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pan.rs b/musicxml/src/elements/pan.rs index 9e2ebce..09f4f59 100644 --- a/musicxml/src/elements/pan.rs +++ b/musicxml/src/elements/pan.rs @@ -1,4 +1,5 @@ use crate::datatypes::RotationDegrees; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part.rs b/musicxml/src/elements/part.rs index f1cbf80..e58fd49 100644 --- a/musicxml/src/elements/part.rs +++ b/musicxml/src/elements/part.rs @@ -3,6 +3,7 @@ use super::{ Note, Print, Sound, }; use crate::datatypes::IdRef; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_abbreviation.rs b/musicxml/src/elements/part_abbreviation.rs index 66a9a18..7315d56 100644 --- a/musicxml/src/elements/part_abbreviation.rs +++ b/musicxml/src/elements/part_abbreviation.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_abbreviation_display.rs b/musicxml/src/elements/part_abbreviation_display.rs index 803ded4..83c9172 100644 --- a/musicxml/src/elements/part_abbreviation_display.rs +++ b/musicxml/src/elements/part_abbreviation_display.rs @@ -1,5 +1,6 @@ use super::{AccidentalText, DisplayText}; use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_clef.rs b/musicxml/src/elements/part_clef.rs index 4c03d7a..5a575e1 100644 --- a/musicxml/src/elements/part_clef.rs +++ b/musicxml/src/elements/part_clef.rs @@ -1,4 +1,5 @@ use super::{ClefOctaveChange, Line, Sign}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_group.rs b/musicxml/src/elements/part_group.rs index 9ab40d4..043a331 100644 --- a/musicxml/src/elements/part_group.rs +++ b/musicxml/src/elements/part_group.rs @@ -3,6 +3,7 @@ use super::{ GroupTime, Level, }; use crate::datatypes::{StartStop, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_link.rs b/musicxml/src/elements/part_link.rs index cff56f0..12ccdb9 100644 --- a/musicxml/src/elements/part_link.rs +++ b/musicxml/src/elements/part_link.rs @@ -1,5 +1,6 @@ use super::{GroupLink, InstrumentLink}; use crate::datatypes::{AnyUri, Token, XlinkActuate, XlinkShow, XlinkType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_list.rs b/musicxml/src/elements/part_list.rs index 5130753..a14bf03 100644 --- a/musicxml/src/elements/part_list.rs +++ b/musicxml/src/elements/part_list.rs @@ -1,4 +1,5 @@ use super::{PartGroup, ScorePart}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_name.rs b/musicxml/src/elements/part_name.rs index 82677e6..77f11ee 100644 --- a/musicxml/src/elements/part_name.rs +++ b/musicxml/src/elements/part_name.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_name_display.rs b/musicxml/src/elements/part_name_display.rs index d08a0ef..af2702a 100644 --- a/musicxml/src/elements/part_name_display.rs +++ b/musicxml/src/elements/part_name_display.rs @@ -1,5 +1,6 @@ use super::{AccidentalText, DisplayText}; use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_symbol.rs b/musicxml/src/elements/part_symbol.rs index 26dd158..d2e6f83 100644 --- a/musicxml/src/elements/part_symbol.rs +++ b/musicxml/src/elements/part_symbol.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, GroupSymbolValue, StaffNumber, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/part_transpose.rs b/musicxml/src/elements/part_transpose.rs index 2342682..da2ba05 100644 --- a/musicxml/src/elements/part_transpose.rs +++ b/musicxml/src/elements/part_transpose.rs @@ -1,4 +1,5 @@ use super::{Chromatic, Diatonic, Double, OctaveChange}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pedal.rs b/musicxml/src/elements/pedal.rs index e1b5a52..342ecd0 100644 --- a/musicxml/src/elements/pedal.rs +++ b/musicxml/src/elements/pedal.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Id, NumberLevel, PedalType, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pedal_alter.rs b/musicxml/src/elements/pedal_alter.rs index 61dd615..78d20b0 100644 --- a/musicxml/src/elements/pedal_alter.rs +++ b/musicxml/src/elements/pedal_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::Semitones; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pedal_step.rs b/musicxml/src/elements/pedal_step.rs index ed323da..acf68f4 100644 --- a/musicxml/src/elements/pedal_step.rs +++ b/musicxml/src/elements/pedal_step.rs @@ -1,4 +1,5 @@ use crate::datatypes::Step; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pedal_tuning.rs b/musicxml/src/elements/pedal_tuning.rs index 4173685..d1d6231 100644 --- a/musicxml/src/elements/pedal_tuning.rs +++ b/musicxml/src/elements/pedal_tuning.rs @@ -1,4 +1,5 @@ use super::{PedalAlter, PedalStep}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/per_minute.rs b/musicxml/src/elements/per_minute.rs index 254cb37..aee94e3 100644 --- a/musicxml/src/elements/per_minute.rs +++ b/musicxml/src/elements/per_minute.rs @@ -1,4 +1,5 @@ use crate::datatypes::{FontFamily, FontSize, FontStyle, FontWeight}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/percussion.rs b/musicxml/src/elements/percussion.rs index fadde20..67d68cd 100644 --- a/musicxml/src/elements/percussion.rs +++ b/musicxml/src/elements/percussion.rs @@ -2,6 +2,7 @@ use super::{Beater, Effect, Glass, Membrane, Metal, OtherPercussion, Pitched, St use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, Tenths, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; @@ -186,6 +187,7 @@ mod percussion_tests { use crate::datatypes::SmuflPictogramGlyphName; use crate::elements::*; use crate::parser::{parse_from_xml_str, parse_to_xml_str}; + use alloc::string::String; #[test] fn serialize_valid1() { diff --git a/musicxml/src/elements/pf.rs b/musicxml/src/elements/pf.rs index af1dbbc..bc6fc31 100644 --- a/musicxml/src/elements/pf.rs +++ b/musicxml/src/elements/pf.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pitch.rs b/musicxml/src/elements/pitch.rs index 70f8793..15c11c7 100644 --- a/musicxml/src/elements/pitch.rs +++ b/musicxml/src/elements/pitch.rs @@ -1,4 +1,5 @@ use super::{Alter, Octave, Step}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pitched.rs b/musicxml/src/elements/pitched.rs index 3ce42d9..501e1cf 100644 --- a/musicxml/src/elements/pitched.rs +++ b/musicxml/src/elements/pitched.rs @@ -1,4 +1,5 @@ use crate::datatypes::{PitchedValue, SmuflPictogramGlyphName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/play.rs b/musicxml/src/elements/play.rs index e0079e7..b369127 100644 --- a/musicxml/src/elements/play.rs +++ b/musicxml/src/elements/play.rs @@ -1,5 +1,6 @@ use super::{Ipa, Mute, OtherPlay, SemiPitched}; use crate::datatypes::IdRef; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/player.rs b/musicxml/src/elements/player.rs index e633b4d..ef0842f 100644 --- a/musicxml/src/elements/player.rs +++ b/musicxml/src/elements/player.rs @@ -1,5 +1,6 @@ use super::PlayerName; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/player_name.rs b/musicxml/src/elements/player_name.rs index 6cb79a8..3852e26 100644 --- a/musicxml/src/elements/player_name.rs +++ b/musicxml/src/elements/player_name.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/plop.rs b/musicxml/src/elements/plop.rs index b2c615e..deae4dd 100644 --- a/musicxml/src/elements/plop.rs +++ b/musicxml/src/elements/plop.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, LineLength, LineShape, LineType, Tenths, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pluck.rs b/musicxml/src/elements/pluck.rs index 56cb34f..c0a54b0 100644 --- a/musicxml/src/elements/pluck.rs +++ b/musicxml/src/elements/pluck.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pp.rs b/musicxml/src/elements/pp.rs index 0310340..8a93080 100644 --- a/musicxml/src/elements/pp.rs +++ b/musicxml/src/elements/pp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ppp.rs b/musicxml/src/elements/ppp.rs index 4deb81f..6b4b8f4 100644 --- a/musicxml/src/elements/ppp.rs +++ b/musicxml/src/elements/ppp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pppp.rs b/musicxml/src/elements/pppp.rs index 7d511e0..fee5bf3 100644 --- a/musicxml/src/elements/pppp.rs +++ b/musicxml/src/elements/pppp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/ppppp.rs b/musicxml/src/elements/ppppp.rs index 71299bb..e3b987b 100644 --- a/musicxml/src/elements/ppppp.rs +++ b/musicxml/src/elements/ppppp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pppppp.rs b/musicxml/src/elements/pppppp.rs index abdc882..0ea9632 100644 --- a/musicxml/src/elements/pppppp.rs +++ b/musicxml/src/elements/pppppp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pre_bend.rs b/musicxml/src/elements/pre_bend.rs index 9184b86..60e800f 100644 --- a/musicxml/src/elements/pre_bend.rs +++ b/musicxml/src/elements/pre_bend.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/prefix.rs b/musicxml/src/elements/prefix.rs index 4ac1bc3..098b0d5 100644 --- a/musicxml/src/elements/prefix.rs +++ b/musicxml/src/elements/prefix.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/principal_voice.rs b/musicxml/src/elements/principal_voice.rs index 84f8278..0bb427e 100644 --- a/musicxml/src/elements/principal_voice.rs +++ b/musicxml/src/elements/principal_voice.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, PrincipalVoiceSymbol, StartStop, Tenths, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/print.rs b/musicxml/src/elements/print.rs index eb2d882..1b192ed 100644 --- a/musicxml/src/elements/print.rs +++ b/musicxml/src/elements/print.rs @@ -2,6 +2,7 @@ use super::{ MeasureLayout, MeasureNumbering, PageLayout, PartAbbreviationDisplay, PartNameDisplay, StaffLayout, SystemLayout, }; use crate::datatypes::{Id, PositiveInteger, Tenths, Token, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/pull_off.rs b/musicxml/src/elements/pull_off.rs index 37eaa3d..ea670a7 100644 --- a/musicxml/src/elements/pull_off.rs +++ b/musicxml/src/elements/pull_off.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, NumberLevel, StartStop, Tenths, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/rehearsal.rs b/musicxml/src/elements/rehearsal.rs index 550387b..610a08c 100644 --- a/musicxml/src/elements/rehearsal.rs +++ b/musicxml/src/elements/rehearsal.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, Tenths, TextDirection, Valign, XmlLang, XmlSpace, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/relation.rs b/musicxml/src/elements/relation.rs index 4e3e622..d0a82f5 100644 --- a/musicxml/src/elements/relation.rs +++ b/musicxml/src/elements/relation.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/release.rs b/musicxml/src/elements/release.rs index 34d4046..4bf510e 100644 --- a/musicxml/src/elements/release.rs +++ b/musicxml/src/elements/release.rs @@ -1,4 +1,5 @@ use crate::datatypes::Divisions; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/repeat.rs b/musicxml/src/elements/repeat.rs index fe05727..51b88e5 100644 --- a/musicxml/src/elements/repeat.rs +++ b/musicxml/src/elements/repeat.rs @@ -1,4 +1,5 @@ use crate::datatypes::{BackwardForward, NonNegativeInteger, Winged, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/rest.rs b/musicxml/src/elements/rest.rs index 16a8c85..a9f5748 100644 --- a/musicxml/src/elements/rest.rs +++ b/musicxml/src/elements/rest.rs @@ -1,5 +1,6 @@ use super::{DisplayOctave, DisplayStep}; use crate::datatypes::YesNo; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/rf.rs b/musicxml/src/elements/rf.rs index 33f0ddc..f99699c 100644 --- a/musicxml/src/elements/rf.rs +++ b/musicxml/src/elements/rf.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/rfz.rs b/musicxml/src/elements/rfz.rs index beb9cc1..30ecfa4 100644 --- a/musicxml/src/elements/rfz.rs +++ b/musicxml/src/elements/rfz.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/right_divider.rs b/musicxml/src/elements/right_divider.rs index 8898965..696d6b0 100644 --- a/musicxml/src/elements/right_divider.rs +++ b/musicxml/src/elements/right_divider.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftCenterRight, Tenths, Valign, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/right_margin.rs b/musicxml/src/elements/right_margin.rs index 91bacea..baa49e1 100644 --- a/musicxml/src/elements/right_margin.rs +++ b/musicxml/src/elements/right_margin.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/rights.rs b/musicxml/src/elements/rights.rs index 4c34fd9..e965e46 100644 --- a/musicxml/src/elements/rights.rs +++ b/musicxml/src/elements/rights.rs @@ -1,4 +1,5 @@ use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/root.rs b/musicxml/src/elements/root.rs index 3f2e54d..7361202 100644 --- a/musicxml/src/elements/root.rs +++ b/musicxml/src/elements/root.rs @@ -1,4 +1,5 @@ use super::{RootAlter, RootStep}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/root_alter.rs b/musicxml/src/elements/root_alter.rs index f5cb0cc..36745d4 100644 --- a/musicxml/src/elements/root_alter.rs +++ b/musicxml/src/elements/root_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, LeftRight, Semitones, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/root_step.rs b/musicxml/src/elements/root_step.rs index a781e2b..e50f2a3 100644 --- a/musicxml/src/elements/root_step.rs +++ b/musicxml/src/elements/root_step.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Step, Tenths, Token}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/scaling.rs b/musicxml/src/elements/scaling.rs index a71c224..5e18baa 100644 --- a/musicxml/src/elements/scaling.rs +++ b/musicxml/src/elements/scaling.rs @@ -1,4 +1,5 @@ use super::{Millimeters, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/schleifer.rs b/musicxml/src/elements/schleifer.rs index 450a46d..37d4eae 100644 --- a/musicxml/src/elements/schleifer.rs +++ b/musicxml/src/elements/schleifer.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/scoop.rs b/musicxml/src/elements/scoop.rs index 58eade0..eb19ab4 100644 --- a/musicxml/src/elements/scoop.rs +++ b/musicxml/src/elements/scoop.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, LineLength, LineShape, LineType, Tenths, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/scordatura.rs b/musicxml/src/elements/scordatura.rs index 6dda29c..765207e 100644 --- a/musicxml/src/elements/scordatura.rs +++ b/musicxml/src/elements/scordatura.rs @@ -1,5 +1,6 @@ use super::Accord; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/score_instrument.rs b/musicxml/src/elements/score_instrument.rs index 693af2f..9813136 100644 --- a/musicxml/src/elements/score_instrument.rs +++ b/musicxml/src/elements/score_instrument.rs @@ -1,5 +1,6 @@ use super::{Ensemble, InstrumentAbbreviation, InstrumentName, InstrumentSound, Solo, VirtualInstrument}; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/score_part.rs b/musicxml/src/elements/score_part.rs index 328be02..c3f2926 100644 --- a/musicxml/src/elements/score_part.rs +++ b/musicxml/src/elements/score_part.rs @@ -3,6 +3,7 @@ use super::{ PartNameDisplay, Player, ScoreInstrument, }; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/score_partwise.rs b/musicxml/src/elements/score_partwise.rs index 9411d30..3d68593 100644 --- a/musicxml/src/elements/score_partwise.rs +++ b/musicxml/src/elements/score_partwise.rs @@ -1,5 +1,6 @@ use super::{Credit, Defaults, Identification, MovementNumber, MovementTitle, Part, PartList, Work}; use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/score_timewise.rs b/musicxml/src/elements/score_timewise.rs index d7cb2ba..c823c1a 100644 --- a/musicxml/src/elements/score_timewise.rs +++ b/musicxml/src/elements/score_timewise.rs @@ -1,5 +1,6 @@ use super::{Credit, Defaults, Identification, Measure, MovementNumber, MovementTitle, PartList, Work}; use crate::datatypes::Token; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/second.rs b/musicxml/src/elements/second.rs index 8d6bf79..ba68ba9 100644 --- a/musicxml/src/elements/second.rs +++ b/musicxml/src/elements/second.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/segno.rs b/musicxml/src/elements/segno.rs index 1e0e36a..ecbaf75 100644 --- a/musicxml/src/elements/segno.rs +++ b/musicxml/src/elements/segno.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, SmuflSegnoGlyphName, Tenths, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/semi_pitched.rs b/musicxml/src/elements/semi_pitched.rs index 08dd591..d0063e3 100644 --- a/musicxml/src/elements/semi_pitched.rs +++ b/musicxml/src/elements/semi_pitched.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/senza_misura.rs b/musicxml/src/elements/senza_misura.rs index e8ad1b6..e9c7afa 100644 --- a/musicxml/src/elements/senza_misura.rs +++ b/musicxml/src/elements/senza_misura.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sf.rs b/musicxml/src/elements/sf.rs index 9155a09..6930e53 100644 --- a/musicxml/src/elements/sf.rs +++ b/musicxml/src/elements/sf.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sffz.rs b/musicxml/src/elements/sffz.rs index 130e12b..1158d08 100644 --- a/musicxml/src/elements/sffz.rs +++ b/musicxml/src/elements/sffz.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sfp.rs b/musicxml/src/elements/sfp.rs index b7018df..e39cc1b 100644 --- a/musicxml/src/elements/sfp.rs +++ b/musicxml/src/elements/sfp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sfpp.rs b/musicxml/src/elements/sfpp.rs index 7a82fbf..4e840d7 100644 --- a/musicxml/src/elements/sfpp.rs +++ b/musicxml/src/elements/sfpp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sfz.rs b/musicxml/src/elements/sfz.rs index 7f8b3b0..a80c464 100644 --- a/musicxml/src/elements/sfz.rs +++ b/musicxml/src/elements/sfz.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sfzp.rs b/musicxml/src/elements/sfzp.rs index 7115cd9..e60e2a0 100644 --- a/musicxml/src/elements/sfzp.rs +++ b/musicxml/src/elements/sfzp.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/shake.rs b/musicxml/src/elements/shake.rs index 57ddb3a..20d833f 100644 --- a/musicxml/src/elements/shake.rs +++ b/musicxml/src/elements/shake.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sign.rs b/musicxml/src/elements/sign.rs index a7ae698..58598ff 100644 --- a/musicxml/src/elements/sign.rs +++ b/musicxml/src/elements/sign.rs @@ -1,4 +1,5 @@ use crate::datatypes::ClefSign; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/slash.rs b/musicxml/src/elements/slash.rs index a07820b..1040a8c 100644 --- a/musicxml/src/elements/slash.rs +++ b/musicxml/src/elements/slash.rs @@ -1,5 +1,6 @@ use super::{ExceptVoice, SlashDot, SlashType}; use crate::datatypes::{StartStop, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/slash_dot.rs b/musicxml/src/elements/slash_dot.rs index 4e9d41b..12ad2c9 100644 --- a/musicxml/src/elements/slash_dot.rs +++ b/musicxml/src/elements/slash_dot.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/slash_type.rs b/musicxml/src/elements/slash_type.rs index 476d73b..a917e5a 100644 --- a/musicxml/src/elements/slash_type.rs +++ b/musicxml/src/elements/slash_type.rs @@ -1,4 +1,5 @@ use crate::datatypes::NoteTypeValue; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/slide.rs b/musicxml/src/elements/slide.rs index a50b614..c095ded 100644 --- a/musicxml/src/elements/slide.rs +++ b/musicxml/src/elements/slide.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LineType, NumberLevel, Percent, StartStop, Tenths, TrillBeats, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/slur.rs b/musicxml/src/elements/slur.rs index 5dcf4f4..0140ec6 100644 --- a/musicxml/src/elements/slur.rs +++ b/musicxml/src/elements/slur.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, Divisions, Id, LineType, NumberLevel, OverUnder, StartStopContinue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/smear.rs b/musicxml/src/elements/smear.rs index 3e3f369..245feaa 100644 --- a/musicxml/src/elements/smear.rs +++ b/musicxml/src/elements/smear.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/snap_pizzicato.rs b/musicxml/src/elements/snap_pizzicato.rs index d8c7bb3..40f4f74 100644 --- a/musicxml/src/elements/snap_pizzicato.rs +++ b/musicxml/src/elements/snap_pizzicato.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/soft_accent.rs b/musicxml/src/elements/soft_accent.rs index 301f56f..3995266 100644 --- a/musicxml/src/elements/soft_accent.rs +++ b/musicxml/src/elements/soft_accent.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/software.rs b/musicxml/src/elements/software.rs index 1ab02e7..2fe128a 100644 --- a/musicxml/src/elements/software.rs +++ b/musicxml/src/elements/software.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/solo.rs b/musicxml/src/elements/solo.rs index acb6c4d..0fb0feb 100644 --- a/musicxml/src/elements/solo.rs +++ b/musicxml/src/elements/solo.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sound.rs b/musicxml/src/elements/sound.rs index 5caf4d3..a32e1ff 100644 --- a/musicxml/src/elements/sound.rs +++ b/musicxml/src/elements/sound.rs @@ -1,5 +1,6 @@ use super::{InstrumentChange, MidiDevice, MidiInstrument, Offset, Play, Swing}; use crate::datatypes::{Divisions, Id, NonNegativeDecimal, RotationDegrees, TimeOnly, Token, YesNo, YesNoNumber}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sounding_pitch.rs b/musicxml/src/elements/sounding_pitch.rs index 40e1174..e889eb7 100644 --- a/musicxml/src/elements/sounding_pitch.rs +++ b/musicxml/src/elements/sounding_pitch.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/source.rs b/musicxml/src/elements/source.rs index 5079758..1df13bb 100644 --- a/musicxml/src/elements/source.rs +++ b/musicxml/src/elements/source.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/spiccato.rs b/musicxml/src/elements/spiccato.rs index 4221672..ec3d07f 100644 --- a/musicxml/src/elements/spiccato.rs +++ b/musicxml/src/elements/spiccato.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staccatissimo.rs b/musicxml/src/elements/staccatissimo.rs index 4910bf3..68becb2 100644 --- a/musicxml/src/elements/staccatissimo.rs +++ b/musicxml/src/elements/staccatissimo.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staccato.rs b/musicxml/src/elements/staccato.rs index 9794322..4829f7b 100644 --- a/musicxml/src/elements/staccato.rs +++ b/musicxml/src/elements/staccato.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff.rs b/musicxml/src/elements/staff.rs index 7b71711..37369ac 100644 --- a/musicxml/src/elements/staff.rs +++ b/musicxml/src/elements/staff.rs @@ -1,4 +1,5 @@ use crate::datatypes::PositiveInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_details.rs b/musicxml/src/elements/staff_details.rs index 69a5aa0..4e636f5 100644 --- a/musicxml/src/elements/staff_details.rs +++ b/musicxml/src/elements/staff_details.rs @@ -1,5 +1,6 @@ use super::{Capo, LineDetail, StaffLines, StaffSize, StaffTuning, StaffType}; use crate::datatypes::{ShowFrets, StaffNumber, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_distance.rs b/musicxml/src/elements/staff_distance.rs index 34f3e1c..6aabcd6 100644 --- a/musicxml/src/elements/staff_distance.rs +++ b/musicxml/src/elements/staff_distance.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_divide.rs b/musicxml/src/elements/staff_divide.rs index eb05476..9b886ff 100644 --- a/musicxml/src/elements/staff_divide.rs +++ b/musicxml/src/elements/staff_divide.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, StaffDivideSymbol, Tenths, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_layout.rs b/musicxml/src/elements/staff_layout.rs index c7f6208..a028d99 100644 --- a/musicxml/src/elements/staff_layout.rs +++ b/musicxml/src/elements/staff_layout.rs @@ -1,5 +1,6 @@ use super::StaffDistance; use crate::datatypes::StaffNumber; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_lines.rs b/musicxml/src/elements/staff_lines.rs index fd6329c..bdc2a6d 100644 --- a/musicxml/src/elements/staff_lines.rs +++ b/musicxml/src/elements/staff_lines.rs @@ -1,4 +1,5 @@ use crate::datatypes::NonNegativeInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_size.rs b/musicxml/src/elements/staff_size.rs index d55fa67..09724eb 100644 --- a/musicxml/src/elements/staff_size.rs +++ b/musicxml/src/elements/staff_size.rs @@ -1,4 +1,5 @@ use crate::datatypes::NonNegativeDecimal; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_tuning.rs b/musicxml/src/elements/staff_tuning.rs index 448c02f..7c9c8fc 100644 --- a/musicxml/src/elements/staff_tuning.rs +++ b/musicxml/src/elements/staff_tuning.rs @@ -1,5 +1,6 @@ use super::{TuningAlter, TuningOctave, TuningStep}; use crate::datatypes::StaffLine; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staff_type.rs b/musicxml/src/elements/staff_type.rs index e8d58ea..5f634b8 100644 --- a/musicxml/src/elements/staff_type.rs +++ b/musicxml/src/elements/staff_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/staves.rs b/musicxml/src/elements/staves.rs index 952e1f5..0d50252 100644 --- a/musicxml/src/elements/staves.rs +++ b/musicxml/src/elements/staves.rs @@ -1,4 +1,5 @@ use crate::datatypes::NonNegativeInteger; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/stem.rs b/musicxml/src/elements/stem.rs index 2e48995..61f8105 100644 --- a/musicxml/src/elements/stem.rs +++ b/musicxml/src/elements/stem.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, StemValue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/step.rs b/musicxml/src/elements/step.rs index f03fd08..c4a47aa 100644 --- a/musicxml/src/elements/step.rs +++ b/musicxml/src/elements/step.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/stick.rs b/musicxml/src/elements/stick.rs index 9d065e0..b76ef53 100644 --- a/musicxml/src/elements/stick.rs +++ b/musicxml/src/elements/stick.rs @@ -1,5 +1,6 @@ use super::{StickMaterial, StickType}; use crate::datatypes::{TipDirection, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/stick_location.rs b/musicxml/src/elements/stick_location.rs index 4e7ebc8..bd61d7f 100644 --- a/musicxml/src/elements/stick_location.rs +++ b/musicxml/src/elements/stick_location.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/stick_material.rs b/musicxml/src/elements/stick_material.rs index 9ce4141..c97774f 100644 --- a/musicxml/src/elements/stick_material.rs +++ b/musicxml/src/elements/stick_material.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/stick_type.rs b/musicxml/src/elements/stick_type.rs index 01ab60f..d6cc164 100644 --- a/musicxml/src/elements/stick_type.rs +++ b/musicxml/src/elements/stick_type.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/stopped.rs b/musicxml/src/elements/stopped.rs index 9092d54..e88d736 100644 --- a/musicxml/src/elements/stopped.rs +++ b/musicxml/src/elements/stopped.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/straight.rs b/musicxml/src/elements/straight.rs index 7f2d5d9..2636b14 100644 --- a/musicxml/src/elements/straight.rs +++ b/musicxml/src/elements/straight.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/stress.rs b/musicxml/src/elements/stress.rs index 3b38ee0..c69e026 100644 --- a/musicxml/src/elements/stress.rs +++ b/musicxml/src/elements/stress.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/string.rs b/musicxml/src/elements/string.rs index eb674ba..85fcc7c 100644 --- a/musicxml/src/elements/string.rs +++ b/musicxml/src/elements/string.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/string_mute.rs b/musicxml/src/elements/string_mute.rs index 607ca8b..77b8c34 100644 --- a/musicxml/src/elements/string_mute.rs +++ b/musicxml/src/elements/string_mute.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, OnOff, Tenths, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/strong_accent.rs b/musicxml/src/elements/strong_accent.rs index 6d41014..beaa864 100644 --- a/musicxml/src/elements/strong_accent.rs +++ b/musicxml/src/elements/strong_accent.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths, UpDown}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/suffix.rs b/musicxml/src/elements/suffix.rs index 36fc463..a99ed5c 100644 --- a/musicxml/src/elements/suffix.rs +++ b/musicxml/src/elements/suffix.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/supports.rs b/musicxml/src/elements/supports.rs index 12c0ff8..278878a 100644 --- a/musicxml/src/elements/supports.rs +++ b/musicxml/src/elements/supports.rs @@ -1,4 +1,5 @@ use crate::datatypes::{NmToken, Token, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/swing.rs b/musicxml/src/elements/swing.rs index 0b3b9eb..0531e8d 100644 --- a/musicxml/src/elements/swing.rs +++ b/musicxml/src/elements/swing.rs @@ -1,4 +1,5 @@ use super::{First, Second, Straight, SwingStyle, SwingType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/swing_style.rs b/musicxml/src/elements/swing_style.rs index 343768a..67f3d53 100644 --- a/musicxml/src/elements/swing_style.rs +++ b/musicxml/src/elements/swing_style.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/swing_type.rs b/musicxml/src/elements/swing_type.rs index b43717f..efa6199 100644 --- a/musicxml/src/elements/swing_type.rs +++ b/musicxml/src/elements/swing_type.rs @@ -1,4 +1,5 @@ use crate::datatypes::SwingTypeValue; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/syllabic.rs b/musicxml/src/elements/syllabic.rs index ef05f42..2a3a86d 100644 --- a/musicxml/src/elements/syllabic.rs +++ b/musicxml/src/elements/syllabic.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/symbol.rs b/musicxml/src/elements/symbol.rs index 121a894..a153cf4 100644 --- a/musicxml/src/elements/symbol.rs +++ b/musicxml/src/elements/symbol.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, SmuflGlyphName, Tenths, TextDirection, Valign, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/sync.rs b/musicxml/src/elements/sync.rs index eb49ee2..5ede078 100644 --- a/musicxml/src/elements/sync.rs +++ b/musicxml/src/elements/sync.rs @@ -1,4 +1,5 @@ use crate::datatypes::{IdRef, Milliseconds, SyncType, TimeOnly}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/system_distance.rs b/musicxml/src/elements/system_distance.rs index 48261b4..61d29dc 100644 --- a/musicxml/src/elements/system_distance.rs +++ b/musicxml/src/elements/system_distance.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/system_dividers.rs b/musicxml/src/elements/system_dividers.rs index 678109f..33e5620 100644 --- a/musicxml/src/elements/system_dividers.rs +++ b/musicxml/src/elements/system_dividers.rs @@ -1,4 +1,5 @@ use super::{LeftDivider, RightDivider}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/system_layout.rs b/musicxml/src/elements/system_layout.rs index 3d64f46..62ba737 100644 --- a/musicxml/src/elements/system_layout.rs +++ b/musicxml/src/elements/system_layout.rs @@ -1,4 +1,5 @@ use super::{SystemDistance, SystemDividers, SystemMargins, TopSystemDistance}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/system_margins.rs b/musicxml/src/elements/system_margins.rs index b0a40e9..70cf072 100644 --- a/musicxml/src/elements/system_margins.rs +++ b/musicxml/src/elements/system_margins.rs @@ -1,4 +1,5 @@ use super::{LeftMargin, RightMargin}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tap.rs b/musicxml/src/elements/tap.rs index 0406be5..69e7279 100644 --- a/musicxml/src/elements/tap.rs +++ b/musicxml/src/elements/tap.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, TapHand, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/technical.rs b/musicxml/src/elements/technical.rs index e4e6e4b..0f00730 100644 --- a/musicxml/src/elements/technical.rs +++ b/musicxml/src/elements/technical.rs @@ -4,6 +4,7 @@ use super::{ Stopped, StringNumber, Tap, ThumbPosition, Toe, TripleTongue, UpBow, }; use crate::datatypes::Id; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tenths.rs b/musicxml/src/elements/tenths.rs index 26d0cd3..cd935f1 100644 --- a/musicxml/src/elements/tenths.rs +++ b/musicxml/src/elements/tenths.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tenuto.rs b/musicxml/src/elements/tenuto.rs index 35841c3..64866b1 100644 --- a/musicxml/src/elements/tenuto.rs +++ b/musicxml/src/elements/tenuto.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/text.rs b/musicxml/src/elements/text.rs index 0b740ef..b7fb8fc 100644 --- a/musicxml/src/elements/text.rs +++ b/musicxml/src/elements/text.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, NumberOfLines, NumberOrNormal, RotationDegrees, TextDirection, XmlLang, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/thumb_position.rs b/musicxml/src/elements/thumb_position.rs index 02eb908..4260666 100644 --- a/musicxml/src/elements/thumb_position.rs +++ b/musicxml/src/elements/thumb_position.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tie.rs b/musicxml/src/elements/tie.rs index a124683..d9a8380 100644 --- a/musicxml/src/elements/tie.rs +++ b/musicxml/src/elements/tie.rs @@ -1,4 +1,5 @@ use crate::datatypes::{StartStop, TimeOnly}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tied.rs b/musicxml/src/elements/tied.rs index e91de12..1d118c8 100644 --- a/musicxml/src/elements/tied.rs +++ b/musicxml/src/elements/tied.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, Divisions, Id, LineType, NumberLevel, OverUnder, StartStopContinue, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/time.rs b/musicxml/src/elements/time.rs index bc60867..bb8f1e7 100644 --- a/musicxml/src/elements/time.rs +++ b/musicxml/src/elements/time.rs @@ -3,6 +3,7 @@ use crate::datatypes::{ Color, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, StaffNumber, Tenths, TimeSeparator, TimeSymbol, Valign, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; @@ -158,6 +159,7 @@ mod time_tests { elements::InterchangeableContents, parser::{parse_from_xml_str, parse_to_xml_str}, }; + use alloc::{string::String, vec::Vec}; #[test] fn serialize_valid1() { diff --git a/musicxml/src/elements/time_modification.rs b/musicxml/src/elements/time_modification.rs index a532337..b9b56dd 100644 --- a/musicxml/src/elements/time_modification.rs +++ b/musicxml/src/elements/time_modification.rs @@ -1,4 +1,5 @@ use super::{ActualNotes, NormalDot, NormalNotes, NormalType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/time_relation.rs b/musicxml/src/elements/time_relation.rs index d733df6..603bdeb 100644 --- a/musicxml/src/elements/time_relation.rs +++ b/musicxml/src/elements/time_relation.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/timpani.rs b/musicxml/src/elements/timpani.rs index 7851b46..5ba00bc 100644 --- a/musicxml/src/elements/timpani.rs +++ b/musicxml/src/elements/timpani.rs @@ -1,4 +1,5 @@ use crate::datatypes::SmuflPictogramGlyphName; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/toe.rs b/musicxml/src/elements/toe.rs index 049486e..73e6084 100644 --- a/musicxml/src/elements/toe.rs +++ b/musicxml/src/elements/toe.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/top_margin.rs b/musicxml/src/elements/top_margin.rs index d676bee..c85fa93 100644 --- a/musicxml/src/elements/top_margin.rs +++ b/musicxml/src/elements/top_margin.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/top_system_distance.rs b/musicxml/src/elements/top_system_distance.rs index 0197975..4d36cb5 100644 --- a/musicxml/src/elements/top_system_distance.rs +++ b/musicxml/src/elements/top_system_distance.rs @@ -1,4 +1,5 @@ use crate::datatypes::Tenths; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/touching_pitch.rs b/musicxml/src/elements/touching_pitch.rs index d787452..92fc95f 100644 --- a/musicxml/src/elements/touching_pitch.rs +++ b/musicxml/src/elements/touching_pitch.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/transpose.rs b/musicxml/src/elements/transpose.rs index 9781bb5..8b829a5 100644 --- a/musicxml/src/elements/transpose.rs +++ b/musicxml/src/elements/transpose.rs @@ -1,5 +1,6 @@ use super::{Chromatic, Diatonic, Double, OctaveChange}; use crate::datatypes::{Id, StaffNumber}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tremolo.rs b/musicxml/src/elements/tremolo.rs index 50e8c5e..282a7e1 100644 --- a/musicxml/src/elements/tremolo.rs +++ b/musicxml/src/elements/tremolo.rs @@ -1,6 +1,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, SmuflGlyphName, Tenths, TremoloMarks, TremoloType, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/trill_mark.rs b/musicxml/src/elements/trill_mark.rs index 40c3403..554b6fd 100644 --- a/musicxml/src/elements/trill_mark.rs +++ b/musicxml/src/elements/trill_mark.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/triple_tongue.rs b/musicxml/src/elements/triple_tongue.rs index 6467f20..70e3e29 100644 --- a/musicxml/src/elements/triple_tongue.rs +++ b/musicxml/src/elements/triple_tongue.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuning_alter.rs b/musicxml/src/elements/tuning_alter.rs index acd420f..b985558 100644 --- a/musicxml/src/elements/tuning_alter.rs +++ b/musicxml/src/elements/tuning_alter.rs @@ -1,4 +1,5 @@ use crate::datatypes::Semitones; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuning_octave.rs b/musicxml/src/elements/tuning_octave.rs index b52adaf..0283c7c 100644 --- a/musicxml/src/elements/tuning_octave.rs +++ b/musicxml/src/elements/tuning_octave.rs @@ -1,4 +1,5 @@ use crate::datatypes::Octave; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuning_step.rs b/musicxml/src/elements/tuning_step.rs index 6a2bfd0..3732f1d 100644 --- a/musicxml/src/elements/tuning_step.rs +++ b/musicxml/src/elements/tuning_step.rs @@ -1,4 +1,5 @@ use crate::datatypes::Step; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuplet.rs b/musicxml/src/elements/tuplet.rs index d4716e0..d922faa 100644 --- a/musicxml/src/elements/tuplet.rs +++ b/musicxml/src/elements/tuplet.rs @@ -1,5 +1,6 @@ use super::{TupletActual, TupletNormal}; use crate::datatypes::{AboveBelow, Id, LineShape, NumberLevel, ShowTuplet, StartStop, Tenths, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuplet_actual.rs b/musicxml/src/elements/tuplet_actual.rs index 206dcdd..8e269a0 100644 --- a/musicxml/src/elements/tuplet_actual.rs +++ b/musicxml/src/elements/tuplet_actual.rs @@ -1,4 +1,5 @@ use super::{TupletDot, TupletNumber, TupletType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuplet_dot.rs b/musicxml/src/elements/tuplet_dot.rs index 9216ea0..6312720 100644 --- a/musicxml/src/elements/tuplet_dot.rs +++ b/musicxml/src/elements/tuplet_dot.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuplet_normal.rs b/musicxml/src/elements/tuplet_normal.rs index 367a142..61cb1b6 100644 --- a/musicxml/src/elements/tuplet_normal.rs +++ b/musicxml/src/elements/tuplet_normal.rs @@ -1,4 +1,5 @@ use super::{TupletDot, TupletNumber, TupletType}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuplet_number.rs b/musicxml/src/elements/tuplet_number.rs index 373c396..a23a713 100644 --- a/musicxml/src/elements/tuplet_number.rs +++ b/musicxml/src/elements/tuplet_number.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, NonNegativeInteger}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/tuplet_type.rs b/musicxml/src/elements/tuplet_type.rs index 3289903..970af2e 100644 --- a/musicxml/src/elements/tuplet_type.rs +++ b/musicxml/src/elements/tuplet_type.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, FontFamily, FontSize, FontStyle, FontWeight, NoteTypeValue}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/turn.rs b/musicxml/src/elements/turn.rs index 6b4b1a3..afbba6c 100644 --- a/musicxml/src/elements/turn.rs +++ b/musicxml/src/elements/turn.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/type.rs b/musicxml/src/elements/type.rs index 0a8b5f7..710f99a 100644 --- a/musicxml/src/elements/type.rs +++ b/musicxml/src/elements/type.rs @@ -1,4 +1,5 @@ use crate::datatypes::{NoteTypeValue, SymbolSize}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/unpitched.rs b/musicxml/src/elements/unpitched.rs index ceb9518..09b1e6d 100644 --- a/musicxml/src/elements/unpitched.rs +++ b/musicxml/src/elements/unpitched.rs @@ -1,4 +1,5 @@ use super::{DisplayOctave, DisplayStep}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/unstress.rs b/musicxml/src/elements/unstress.rs index 489ae51..d46f235 100644 --- a/musicxml/src/elements/unstress.rs +++ b/musicxml/src/elements/unstress.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/up_bow.rs b/musicxml/src/elements/up_bow.rs index 3210a8a..12634fe 100644 --- a/musicxml/src/elements/up_bow.rs +++ b/musicxml/src/elements/up_bow.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/vertical_turn.rs b/musicxml/src/elements/vertical_turn.rs index a373a7b..214cc28 100644 --- a/musicxml/src/elements/vertical_turn.rs +++ b/musicxml/src/elements/vertical_turn.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Percent, StartNote, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/virtual_instrument.rs b/musicxml/src/elements/virtual_instrument.rs index d275ef4..feb4248 100644 --- a/musicxml/src/elements/virtual_instrument.rs +++ b/musicxml/src/elements/virtual_instrument.rs @@ -1,4 +1,5 @@ use super::{VirtualLibrary, VirtualName}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/virtual_library.rs b/musicxml/src/elements/virtual_library.rs index 9ca936d..b062cd3 100644 --- a/musicxml/src/elements/virtual_library.rs +++ b/musicxml/src/elements/virtual_library.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/virtual_name.rs b/musicxml/src/elements/virtual_name.rs index 805299a..c2300ef 100644 --- a/musicxml/src/elements/virtual_name.rs +++ b/musicxml/src/elements/virtual_name.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/voice.rs b/musicxml/src/elements/voice.rs index 3240ff9..4a20ad1 100644 --- a/musicxml/src/elements/voice.rs +++ b/musicxml/src/elements/voice.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/volume.rs b/musicxml/src/elements/volume.rs index a919c27..d60f644 100644 --- a/musicxml/src/elements/volume.rs +++ b/musicxml/src/elements/volume.rs @@ -1,4 +1,5 @@ use crate::datatypes::Percent; +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/wait.rs b/musicxml/src/elements/wait.rs index 633ae7b..a72d0c4 100644 --- a/musicxml/src/elements/wait.rs +++ b/musicxml/src/elements/wait.rs @@ -1,4 +1,5 @@ use crate::datatypes::{IdRef, TimeOnly}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/wavy_line.rs b/musicxml/src/elements/wavy_line.rs index 9b903ba..ad6efdb 100644 --- a/musicxml/src/elements/wavy_line.rs +++ b/musicxml/src/elements/wavy_line.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ AboveBelow, Color, NumberLevel, Percent, SmuflWavyLineGlyphName, StartNote, StartStopContinue, Tenths, TrillBeats, TrillStep, TwoNoteTurn, YesNo, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/wedge.rs b/musicxml/src/elements/wedge.rs index d9ea83e..e3e220c 100644 --- a/musicxml/src/elements/wedge.rs +++ b/musicxml/src/elements/wedge.rs @@ -1,4 +1,5 @@ use crate::datatypes::{Color, Id, LineType, NumberLevel, Tenths, WedgeType, YesNo}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/with_bar.rs b/musicxml/src/elements/with_bar.rs index 56e33c1..be6bf0d 100644 --- a/musicxml/src/elements/with_bar.rs +++ b/musicxml/src/elements/with_bar.rs @@ -1,4 +1,5 @@ use crate::datatypes::{AboveBelow, Color, FontFamily, FontSize, FontStyle, FontWeight, Tenths}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/wood.rs b/musicxml/src/elements/wood.rs index b71b097..6061deb 100644 --- a/musicxml/src/elements/wood.rs +++ b/musicxml/src/elements/wood.rs @@ -1,4 +1,5 @@ use crate::datatypes::{SmuflPictogramGlyphName, WoodValue}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/word_font.rs b/musicxml/src/elements/word_font.rs index b06074b..a01a0b1 100644 --- a/musicxml/src/elements/word_font.rs +++ b/musicxml/src/elements/word_font.rs @@ -1,4 +1,5 @@ use crate::datatypes::{FontFamily, FontSize, FontStyle, FontWeight}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/words.rs b/musicxml/src/elements/words.rs index 5b8030c..1b6c89e 100644 --- a/musicxml/src/elements/words.rs +++ b/musicxml/src/elements/words.rs @@ -2,6 +2,7 @@ use crate::datatypes::{ Color, EnclosureShape, FontFamily, FontSize, FontStyle, FontWeight, Id, LeftCenterRight, NumberOfLines, NumberOrNormal, RotationDegrees, Tenths, TextDirection, Valign, XmlLang, XmlSpace, }; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/work.rs b/musicxml/src/elements/work.rs index ca40a49..aae2fbd 100644 --- a/musicxml/src/elements/work.rs +++ b/musicxml/src/elements/work.rs @@ -1,4 +1,5 @@ use super::{Opus, WorkNumber, WorkTitle}; +use alloc::{string::String, vec::Vec}; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/work_number.rs b/musicxml/src/elements/work_number.rs index 8dfb7fb..db31723 100644 --- a/musicxml/src/elements/work_number.rs +++ b/musicxml/src/elements/work_number.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/elements/work_title.rs b/musicxml/src/elements/work_title.rs index 36be50b..295e96c 100644 --- a/musicxml/src/elements/work_title.rs +++ b/musicxml/src/elements/work_title.rs @@ -1,3 +1,4 @@ +use alloc::string::String; use musicxml_internal::*; use musicxml_macros::*; diff --git a/musicxml/src/lib.rs b/musicxml/src/lib.rs index 789ee07..a055a41 100644 --- a/musicxml/src/lib.rs +++ b/musicxml/src/lib.rs @@ -3,6 +3,7 @@ #![doc(html_favicon_url = "https://hedgetechllc.github.io/musicxml/musicxml/favicon.ico")] #![doc(html_logo_url = "https://hedgetechllc.github.io/musicxml/musicxml/MusicXML-Logo-Square.png")] #![doc(html_playground_url = "https://playground.example.com/")] +#![no_std] //! # Overview //! @@ -104,6 +105,11 @@ //! } //! ``` +#[macro_use] +extern crate alloc; + +use alloc::string::String; + /// Contains the main data types used by the MusicXML format. /// /// Note that these data types correspond to the textual contents of an XML tag. For example, the XML string diff --git a/musicxml/src/parser/mod.rs b/musicxml/src/parser/mod.rs index c13ef42..447e517 100644 --- a/musicxml/src/parser/mod.rs +++ b/musicxml/src/parser/mod.rs @@ -1,12 +1,19 @@ use crate::elements::{ScorePartwise, ScoreTimewise}; +use alloc::{collections::BTreeMap, string::String, vec::Vec}; use musicxml_internal::{ElementDeserializer, ElementSerializer, XmlElement}; -use std::{ - collections::{BTreeMap, HashMap}, - io::{Read, Write}, + +#[cfg(feature = "std")] +extern crate std; + +#[cfg(feature = "std")] +use { + alloc::string::ToString, + std::io::{Read, Write}, }; mod xml_parser; +#[cfg(feature = "std")] fn is_mxl_file(path: &str) -> bool { let mut buffer: [u8; 4] = [0; 4]; if let Ok(mut file) = std::fs::OpenOptions::new().read(true).open(path) { @@ -16,6 +23,7 @@ fn is_mxl_file(path: &str) -> bool { } } +#[cfg(feature = "std")] fn get_musicxml_contents_from_file(path: &str) -> Result { let mut contents = String::new(); if is_mxl_file(path) { @@ -53,6 +61,14 @@ fn get_musicxml_contents_from_file(path: &str) -> Result { Ok(contents) } +#[cfg(not(feature = "std"))] +fn get_musicxml_contents_from_file(_path: &str) -> Result { + Err(String::from( + "Reading MusicXML files is not supported in a 'no_std' environment", + )) +} + +#[cfg(feature = "std")] fn write_musicxml_file(file: &mut T, xml: &XmlElement, pretty_print: bool) -> Result<(), String> { file .write_all(b"\n") @@ -67,6 +83,7 @@ fn write_musicxml_file(file: &mut T, xml: &XmlElement, pretty_print: b .map_err(|e| e.to_string()) } +#[cfg(feature = "std")] fn write_musicxml_to_file(path: &str, xml: &XmlElement, compressed: bool, pretty_print: bool) -> Result<(), String> { if compressed { let options = zip::write::SimpleFileOptions::default() @@ -94,6 +111,18 @@ fn write_musicxml_to_file(path: &str, xml: &XmlElement, compressed: bool, pretty } } +#[cfg(not(feature = "std"))] +fn write_musicxml_to_file( + _path: &str, + _xml: &XmlElement, + _compressed: bool, + _pretty_print: bool, +) -> Result<(), String> { + Err(String::from( + "Writing MusicXML files is not supported in a 'no_std' environment", + )) +} + fn convert_xml_partwise_to_timewise(xml: XmlElement) -> Result { if xml.name == "score-timewise" { Ok(xml) @@ -151,7 +180,7 @@ fn convert_xml_timewise_to_partwise(xml: XmlElement) -> Result = HashMap::new(); + let mut parts: BTreeMap = BTreeMap::new(); let mut converted_xml = XmlElement { name: String::from("score-partwise"), attributes: xml.attributes, @@ -188,7 +217,7 @@ fn convert_xml_timewise_to_partwise(xml: XmlElement) -> Result TagType { +fn read_tag_str(str: &mut core::str::Chars) -> TagType { let mut tag = XmlElement { name: String::new(), attributes: Vec::new(), diff --git a/musicxml_internal/src/lib.rs b/musicxml_internal/src/lib.rs index 61a4ded..39db3a5 100644 --- a/musicxml_internal/src/lib.rs +++ b/musicxml_internal/src/lib.rs @@ -1,3 +1,10 @@ +#![no_std] + +extern crate alloc; + +use alloc::string::{String, ToString}; +use alloc::vec::Vec; + #[derive(Debug, Default, PartialEq, Eq)] pub struct XmlElement { pub name: String, diff --git a/musicxml_macros/src/lib.rs b/musicxml_macros/src/lib.rs index bf0249a..3ffbed9 100644 --- a/musicxml_macros/src/lib.rs +++ b/musicxml_macros/src/lib.rs @@ -1,3 +1,9 @@ +#![no_std] + +extern crate alloc; + +use alloc::string::{String, ToString}; +use alloc::{vec, vec::Vec}; use proc_macro::TokenStream; use quote::quote;