break!: make AttributeMap::get return Option<&str>

Most of the time you'll only be interested in the attribute value,
so the `get` method should directly return it instead of a wrapper type.
This also makes the API more predictable since e.g. the DOM getAttribute
method also returns a string. Lastly previously it was quite confusing
that map[key] wasn't equivalent to map.get(key).unwrap().

2 files changed, 16 insertions, 5 deletions

diff --git a/src/token.rs b/src/token.rs
index 45c8123..da1f8ba 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -144,14 +144,22 @@ pub struct AttributeOwned {
 }
 
 impl AttributeMap {
-    /// Returns the attribute with the given name.
+    /// Returns the value for the given attribute name.
     ///
     /// The name must not contain any uppercase ASCII character (A-Z)
     /// or the method will always return `None`.
-    pub fn get(&self, name: &str) -> Option<Attribute> {
+    pub fn get(&self, name: &str) -> Option<&str> {
+        self.inner.get(name).map(|map_val| map_val.value.as_str())
+    }
+
+    /// Returns the value and trace index for a given attribute name.
+    ///
+    /// The name must not contain any uppercase ASCII character (A-Z)
+    /// or the method will always return `None`.
+    pub fn value_and_trace_idx(&self, name: &str) -> Option<(&str, Option<AttributeTraceIdx>)> {
         self.inner
-            .get_key_value(name)
-            .map(|(name, map_val)| Attribute { name, map_val })
+            .get(name)
+            .map(|map_val| (map_val.value.as_str(), map_val.trace_idx))
     }
 }
 
diff --git a/src/tracing_emitter.rs b/src/tracing_emitter.rs
index 21f40f7..9591839 100644
--- a/src/tracing_emitter.rs
+++ b/src/tracing_emitter.rs
@@ -365,7 +365,10 @@ mod tests {
             ("single-quoted", Some(AttrValueSyntax::SingleQuoted)),
             ("double-quoted", Some(AttrValueSyntax::DoubleQuoted)),
         ] {
-            let attr_trace_idx = tag.attributes.get(name).unwrap().trace_idx().unwrap();
+            let (_, Some(attr_trace_idx)) = tag.attributes.value_and_trace_idx(name).unwrap()
+            else {
+                panic!()
+            };
             assert_eq!(
                 tag_trace.attribute_traces[attr_trace_idx].value_syntax(),
                 syntax,