NationTech/yaserde
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update from clippy errors

Browse Source
This commit is contained in:
Marc-Antoine Arnaud
2018-05-23 18:09:11 +02:00
parent adbc16eb12
commit bbca68f2ee
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yaserde_derive/src/de/expand_enum.rs
View File

@@ -236,7 +236,7 @@ pub fn parse(
XmlEvent::StartElement{name, attributes, namespace: _namespace} => {
debug!("Enum: {}: {}", named_element, name.local_name.as_str());
if name.local_name == named_element {
let _next = reader.next();
let _next = reader.next_event();
if let XmlEvent::Characters(content) = reader.peek()?.to_owned() {
match content.as_str() {
@@ -250,10 +250,10 @@ pub fn parse(
if name.local_name.as_str() == named_element {
break;
}
let _root = reader.next();
let _root = reader.next_event();
},
xml::reader::XmlEvent::Characters(characters_content) => {
let _root = reader.next();
let _root = reader.next_event();
},
event => {
return Err(format!("unknown event {:?}", event))

12
yaserde_derive/src/de/expand_struct.rs
View File

@@ -392,7 +392,7 @@ pub fn parse(
match #struct_name::deserialize(reader) {
Ok(parsed_item) => {
#label = parsed_item;
let _root = reader.next();
let _root = reader.next_event();
},
Err(msg) => {
return Err(msg);
@@ -521,7 +521,7 @@ pub fn parse(
match #struct_ident::deserialize(reader) {
Ok(parsed_item) => {
#label.push(parsed_item);
let _root = reader.next();
let _root = reader.next_event();
},
Err(msg) => {
return Err(msg);
@@ -713,7 +713,7 @@ pub fn parse(
match name.local_name.as_str() {
#call_visitors
named_element => {
let _root = reader.next();
let _root = reader.next_event();
}
// name => {
// return Err(format!("unknown key {}", name))
@@ -725,11 +725,11 @@ pub fn parse(
if name.local_name == named_element {
break;
}
let _root = reader.next();
let _root = reader.next_event();
}
XmlEvent::Characters(ref text_content) => {
#set_text
let _root = reader.next();
let _root = reader.next_event();
}
event => {
return Err(format!("unknown event {:?}", event))
@@ -793,7 +793,7 @@ fn build_call_visitor(
return visitor.#visitor("");
}
if let Ok(XmlEvent::Characters(s)) = reader.next() {
if let Ok(XmlEvent::Characters(s)) = reader.next_event() {
visitor.#visitor(&s)
} else {
Err(format!("unable to parse content for {}", #label_name))