1 files changed, 33 insertions, 33 deletions

diff --git a/src/reader.rs b/src/reader.rs
index abc3354..8387373 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -312,7 +312,7 @@ impl<R> Reader<R> {
             .chain(element_namespace_declarations.iter())
             .collect();
 
-        // element name and default attribute namespace
+        // element name
 
         let element_namespace_declaration;
         let element_local_name = s_tag.name.local_part().to_string();
@@ -330,10 +330,8 @@ impl<R> Reader<R> {
             }
         }
 
-        let element_default_namespace = element_namespace_declaration
-            .ok_or_else(|| Error::UnqualifiedNamespace(s_tag.name.to_string()))?
-            .namespace
-            .clone();
+        let element_default_namespace =
+            element_namespace_declaration.map(|decl| decl.namespace.clone());
 
         let element_name = Name {
             namespace: element_default_namespace,
@@ -361,20 +359,24 @@ impl<R> Reader<R> {
                                 namespace_declaration.prefix.as_deref() == Some(prefix)
                             });
                 }
-                None => attribute_namespace_declaration = element_namespace_declaration,
+                None => attribute_namespace_declaration = None,
             }
+            let name;
             if let Some(namespace_declaration) = attribute_namespace_declaration {
-                let name = Name {
-                    namespace: namespace_declaration.namespace.clone(),
+                name = Name {
+                    namespace: Some(namespace_declaration.namespace.clone()),
                     local_name: attribute_local_name,
                 };
-                let value = value.process()?;
-                // check for duplicate attribute
-                if let Some(_value) = attributes.insert(name, value) {
-                    return Err(Error::DuplicateAttribute(q_name.to_string()));
-                }
             } else {
-                return Err(Error::UnqualifiedNamespace(q_name.to_string()));
+                name = Name {
+                    namespace: None,
+                    local_name: attribute_local_name,
+                };
+            }
+            let value = value.process()?;
+            // check for duplicate attribute
+            if let Some(_value) = attributes.insert(name, value) {
+                return Err(Error::DuplicateAttribute(q_name.to_string()));
             }
         }
 
@@ -415,8 +417,7 @@ impl<R> Reader<R> {
             }
 
             let e_tag_namespace = e_tag_namespace_declaration
-                .ok_or_else(|| Error::UnqualifiedNamespace(xml_e_tag.name.to_string()))?
-                .namespace
+                .map(|decl| decl.namespace.clone())
                 .clone();
 
             let e_tag_name = Name {
@@ -512,10 +513,8 @@ impl<R> Reader<R> {
             }
         }
 
-        let element_default_namespace = element_namespace_declaration
-            .ok_or_else(|| Error::UnqualifiedNamespace(xml_name.to_string()))?
-            .namespace
-            .clone();
+        let element_default_namespace =
+            element_namespace_declaration.map(|decl| decl.namespace.clone());
 
         let element_name = Name {
             namespace: element_default_namespace,
@@ -541,10 +540,7 @@ impl<R> Reader<R> {
                 }
             }
 
-            let e_tag_namespace = e_tag_namespace_declaration
-                .ok_or_else(|| Error::UnqualifiedNamespace(xml_name.to_string()))?
-                .namespace
-                .clone();
+            let e_tag_namespace = e_tag_namespace_declaration.map(|decl| decl.namespace.clone());
 
             let e_tag_name = Name {
                 namespace: e_tag_namespace,
@@ -577,20 +573,24 @@ impl<R> Reader<R> {
                                 namespace_declaration.prefix.as_deref() == Some(prefix)
                             });
                 }
-                None => attribute_namespace_declaration = element_namespace_declaration,
+                None => attribute_namespace_declaration = None,
             }
+            let name;
             if let Some(namespace_declaration) = attribute_namespace_declaration {
-                let name = Name {
-                    namespace: namespace_declaration.namespace.clone(),
+                name = Name {
+                    namespace: Some(namespace_declaration.namespace.clone()),
                     local_name: attribute_local_name,
                 };
-                let value = value.process()?;
-                // check for duplicate attribute
-                if let Some(_value) = attributes.insert(name, value) {
-                    return Err(Error::DuplicateAttribute(q_name.to_string()));
-                }
             } else {
-                return Err(Error::UnqualifiedNamespace(q_name.to_string()));
+                name = Name {
+                    namespace: None,
+                    local_name: attribute_local_name,
+                };
+            }
+            let value = value.process()?;
+            // check for duplicate attribute
+            if let Some(_value) = attributes.insert(name, value) {
+                return Err(Error::DuplicateAttribute(q_name.to_string()));
             }
         }