Skip to content

Commit

Permalink
RustFmt the code.
Browse files Browse the repository at this point in the history
  • Loading branch information
bwinton committed Feb 26, 2018
1 parent 987848c commit fbd8334
Show file tree
Hide file tree
Showing 17 changed files with 125 additions and 139 deletions.
5 changes: 3 additions & 2 deletions src/category.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ impl ToXml for Category {
element.push_attribute(("domain", &**domain));
}
writer.write_event(Event::Start(element))?;
writer
.write_event(Event::Text(BytesText::borrowed(self.name.as_bytes())))?;
writer.write_event(
Event::Text(BytesText::borrowed(self.name.as_bytes())),
)?;
writer.write_event(Event::End(BytesEnd::borrowed(name)))?;
Ok(())
}
Expand Down
27 changes: 15 additions & 12 deletions src/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1218,13 +1218,13 @@ impl ToXml for Channel {
fn to_xml<W: Write>(&self, writer: &mut Writer<W>) -> Result<(), XmlError> {
let name = b"channel";

writer
.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
writer.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;

writer.write_text_element(b"title", &self.title)?;
writer.write_text_element(b"link", &self.link)?;
writer
.write_text_element(b"description", &self.description)?;
writer.write_text_element(b"description", &self.description)?;

if let Some(language) = self.language.as_ref() {
writer.write_text_element(b"language", language)?;
Expand All @@ -1235,8 +1235,10 @@ impl ToXml for Channel {
}

if let Some(managing_editor) = self.managing_editor.as_ref() {
writer
.write_text_element(b"managingEditor", managing_editor)?;
writer.write_text_element(
b"managingEditor",
managing_editor,
)?;
}

if let Some(webmaster) = self.webmaster.as_ref() {
Expand All @@ -1248,8 +1250,7 @@ impl ToXml for Channel {
}

if let Some(last_build_date) = self.last_build_date.as_ref() {
writer
.write_text_element(b"lastBuildDate", last_build_date)?;
writer.write_text_element(b"lastBuildDate", last_build_date)?;
}

writer.write_objects(&self.categories)?;
Expand Down Expand Up @@ -1284,8 +1285,9 @@ impl ToXml for Channel {

if !self.skip_hours.is_empty() {
let name = b"skipHours";
writer
.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
writer.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;
for hour in &self.skip_hours {
writer.write_text_element(b"hour", hour)?;
}
Expand All @@ -1294,8 +1296,9 @@ impl ToXml for Channel {

if !self.skip_days.is_empty() {
let name = b"skipDays";
writer
.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
writer.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;
for day in &self.skip_days {
writer.write_text_element(b"day", day)?;
}
Expand Down
24 changes: 16 additions & 8 deletions src/extension/dublincore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,19 +359,27 @@ impl DublinCoreExtension {

impl ToXml for DublinCoreExtension {
fn to_xml<W: Write>(&self, writer: &mut Writer<W>) -> Result<(), XmlError> {
writer
.write_text_elements(b"dc:contributor", &self.contributors)?;
writer.write_text_elements(
b"dc:contributor",
&self.contributors,
)?;
writer.write_text_elements(b"dc:coverage", &self.coverages)?;
writer.write_text_elements(b"dc:creator", &self.creators)?;
writer.write_text_elements(b"dc:date", &self.dates)?;
writer
.write_text_elements(b"dc:description", &self.descriptions)?;
writer.write_text_elements(
b"dc:description",
&self.descriptions,
)?;
writer.write_text_elements(b"dc:format", &self.formats)?;
writer
.write_text_elements(b"dc:identifier", &self.identifiers)?;
writer.write_text_elements(
b"dc:identifier",
&self.identifiers,
)?;
writer.write_text_elements(b"dc:language", &self.languages)?;
writer
.write_text_elements(b"dc:publisher", &self.publishers)?;
writer.write_text_elements(
b"dc:publisher",
&self.publishers,
)?;
writer.write_text_elements(b"dc:relation", &self.relations)?;
writer.write_text_elements(b"dc:rights", &self.rights)?;
writer.write_text_elements(b"dc:source", &self.sources)?;
Expand Down
6 changes: 4 additions & 2 deletions src/extension/itunes/itunes_channel_extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,10 @@ impl ToXml for ITunesChannelExtension {
}

if let Some(new_feed_url) = self.new_feed_url.as_ref() {
writer
.write_text_element(b"itunes:new-feed-url", new_feed_url)?;
writer.write_text_element(
b"itunes:new-feed-url",
new_feed_url,
)?;
}

if let Some(owner) = self.owner.as_ref() {
Expand Down
6 changes: 4 additions & 2 deletions src/extension/itunes/itunes_item_extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,10 @@ impl ToXml for ITunesItemExtension {
}

if let Some(closed_captioned) = self.closed_captioned.as_ref() {
writer
.write_text_element(b"itunes:isClosedCaptioned", closed_captioned)?;
writer.write_text_element(
b"itunes:isClosedCaptioned",
closed_captioned,
)?;
}

if let Some(order) = self.order.as_ref() {
Expand Down
5 changes: 3 additions & 2 deletions src/extension/itunes/itunes_owner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ impl ToXml for ITunesOwner {
fn to_xml<W: Write>(&self, writer: &mut Writer<W>) -> Result<(), XmlError> {
let name = b"itunes:owner";

writer
.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
writer.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;

if let Some(name) = self.name.as_ref() {
writer.write_text_element(b"itunes:name", name)?;
Expand Down
16 changes: 7 additions & 9 deletions src/extension/itunes/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,13 @@ fn parse_owner(map: &mut HashMap<String, Vec<Extension>>) -> Result<Option<ITune
None => return Ok(None),
};

let name = element
.children
.remove("name")
.and_then(|mut v| v.remove(0).value);

let email = element
.children
.remove("email")
.and_then(|mut v| v.remove(0).value);
let name = element.children.remove("name").and_then(
|mut v| v.remove(0).value,
);

let email = element.children.remove("email").and_then(
|mut v| v.remove(0).value,
);

let mut owner = ITunesOwner::default();
owner.set_name(name);
Expand Down
5 changes: 3 additions & 2 deletions src/extension/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ impl ToXml for Extension {
writer.write_event(Event::Start(element))?;

if let Some(value) = self.value.as_ref() {
writer
.write_event(Event::Text(BytesText::borrowed(value.as_bytes())))?;
writer.write_event(
Event::Text(BytesText::borrowed(value.as_bytes())),
)?;
}

for extension in self.children.values().flat_map(|extensions| extensions) {
Expand Down
6 changes: 3 additions & 3 deletions src/extension/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ pub fn remove_extension_value(
map: &mut HashMap<String, Vec<Extension>>,
key: &str,
) -> Option<String> {
map.remove(key)
.map(|mut v| v.remove(0))
.and_then(|ext| ext.value)
map.remove(key).map(|mut v| v.remove(0)).and_then(
|ext| ext.value,
)
}
5 changes: 3 additions & 2 deletions src/guid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ impl ToXml for Guid {

writer.write_event(Event::Start(element))?;

writer
.write_event(Event::Text(BytesText::borrowed(self.value.as_bytes())))?;
writer.write_event(Event::Text(
BytesText::borrowed(self.value.as_bytes()),
))?;

writer.write_event(Event::End(BytesEnd::borrowed(name)))?;
Ok(())
Expand Down
5 changes: 3 additions & 2 deletions src/image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,9 @@ impl ToXml for Image {
fn to_xml<W: Write>(&self, writer: &mut Writer<W>) -> Result<(), XmlError> {
let name = b"image";

writer
.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
writer.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;

writer.write_text_element(b"url", &self.url)?;
writer.write_text_element(b"title", &self.title)?;
Expand Down
5 changes: 3 additions & 2 deletions src/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -608,8 +608,9 @@ impl ToXml for Item {
fn to_xml<W: Write>(&self, writer: &mut Writer<W>) -> Result<(), XmlError> {
let name = b"item";

writer
.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
writer.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;

if let Some(title) = self.title.as_ref() {
writer.write_text_element(b"title", title)?;
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ extern crate quick_xml;
#[macro_use]
extern crate serde;
#[cfg(feature = "serde")]

#[cfg(feature = "validation")]
extern crate chrono;
#[cfg(feature = "validation")]
Expand Down
8 changes: 4 additions & 4 deletions src/textinput.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,12 @@ impl ToXml for TextInput {
fn to_xml<W: Write>(&self, writer: &mut Writer<W>) -> Result<(), XmlError> {
let name = b"textInput";

writer
.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
writer.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;

writer.write_text_element(b"title", &self.title)?;
writer
.write_text_element(b"description", &self.description)?;
writer.write_text_element(b"description", &self.description)?;
writer.write_text_element(b"name", &self.name)?;
writer.write_text_element(b"link", &self.link)?;

Expand Down
12 changes: 9 additions & 3 deletions src/toxml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ impl<W: Write> WriterExt for Writer<W> {
T: AsRef<str>,
{
let name = name.as_ref();
self.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
self.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;
self.write_event(Event::Text(BytesText::from_str(text)))?;
self.write_event(Event::End(BytesEnd::borrowed(name)))?;
Ok(())
Expand All @@ -80,8 +82,12 @@ impl<W: Write> WriterExt for Writer<W> {
T: AsRef<[u8]>,
{
let name = name.as_ref();
self.write_event(Event::Start(BytesStart::borrowed(name, name.len())))?;
self.write_event(Event::CData(BytesText::borrowed(text.as_ref())))?;
self.write_event(
Event::Start(BytesStart::borrowed(name, name.len())),
)?;
self.write_event(
Event::CData(BytesText::borrowed(text.as_ref())),
)?;
self.write_event(Event::End(BytesEnd::borrowed(name)))?;
Ok(())
}
Expand Down
3 changes: 1 addition & 2 deletions src/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,7 @@ impl Validate for Cloud {
validate!(port > 0, "Cloud port must be greather than 0");
Url::parse(self.domain())?;
validate!(
self.protocol() == "xml-rpc" || self.protocol() == "soap" ||
self.protocol() == "http-post",
self.protocol() == "xml-rpc" || self.protocol() == "soap" || self.protocol() == "http-post",
format!("Unknown cloud protocol: {}", self.protocol())
);
Ok(())
Expand Down

0 comments on commit fbd8334

Please sign in to comment.