Skip to content

Commit

Permalink
Use rustfmt defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
James Hurst committed May 21, 2017
1 parent e1fc6ac commit 593b7aa
Show file tree
Hide file tree
Showing 23 changed files with 1,320 additions and 2,183 deletions.
61 changes: 0 additions & 61 deletions .rustfmt.toml

This file was deleted.

15 changes: 3 additions & 12 deletions benches/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,19 @@ use test::Bencher;
fn write_rss2sample(b: &mut Bencher) {
let input: &[u8] = include_bytes!("../tests/data/rss2sample.xml");
let channel = Channel::read_from(input).expect("failed to parse feed");
b.iter(|| {
let _ = channel.write_to(sink())
.expect("failed to write");
});
b.iter(|| { let _ = channel.write_to(sink()).expect("failed to write"); });
}

#[bench]
fn write_itunes(b: &mut Bencher) {
let input: &[u8] = include_bytes!("../tests/data/itunes.xml");
let channel = Channel::read_from(input).expect("failed to parse feed");
b.iter(|| {
let _ = channel.write_to(sink())
.expect("failed to write");
});
b.iter(|| { let _ = channel.write_to(sink()).expect("failed to write"); });
}

#[bench]
fn write_dublincore(b: &mut Bencher) {
let input: &[u8] = include_bytes!("../tests/data/dublincore.xml");
let channel = Channel::read_from(input).expect("failed to parse feed");
b.iter(|| {
let _ = channel.write_to(sink())
.expect("failed to write");
});
b.iter(|| { let _ = channel.write_to(sink()).expect("failed to write"); });
}
61 changes: 27 additions & 34 deletions src/category.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use error::Error;
use fromxml::FromXml;
use quick_xml::{Element, Event, XmlReader, XmlWriter};
use quick_xml::error::Error as XmlError;
use url::Url;
use toxml::ToXml;
use url::Url;

/// A representation of the `<category>` element.
#[derive(Debug, Default, Clone, PartialEq)]
Expand Down Expand Up @@ -39,8 +39,7 @@ impl Category {
/// assert_eq!(category, category_obj.name());
/// ```
pub fn name(&self) -> &str {
self.name
.as_str()
self.name.as_str()
}

/// Get the optional domain that exists under `Category`.
Expand Down Expand Up @@ -72,54 +71,50 @@ impl Category {
/// assert!(domain_option.is_none());
/// ```
pub fn domain(&self) -> Option<&str> {
self.domain
.as_ref()
.map(|s| s.as_str())
self.domain.as_ref().map(|s| s.as_str())
}
}

impl FromXml for Category {
fn from_xml<R: ::std::io::BufRead>(mut reader: XmlReader<R>,
element: Element)
-> Result<(Self, XmlReader<R>), Error> {
-> Result<(Self, XmlReader<R>), Error> {
let mut domain = None;

for attr in element.attributes()
.with_checks(false)
.unescaped() {
for attr in element.attributes().with_checks(false).unescaped() {
if let Ok(attr) = attr {
if attr.0 == b"domain" {
domain = Some(String::from_utf8(attr.1
.into_owned())?);
domain = Some(String::from_utf8(attr.1.into_owned())?);
break;
}
}
}

let content = element_text!(reader).unwrap_or_default();

Ok((Category { name: content,
domain: domain, },
Ok((Category {
name: content,
domain: domain,
},
reader))
}
}

impl ToXml for Category {
fn to_xml<W: ::std::io::Write>(&self,
writer: &mut XmlWriter<W>)
-> Result<(), XmlError> {
fn to_xml<W: ::std::io::Write>(&self, writer: &mut XmlWriter<W>) -> Result<(), XmlError> {
let element = Element::new(b"category");

writer.write(Event::Start({
let mut element = element.clone();
if let Some(ref domain) = self.domain {
element.extend_attributes(::std::iter::once((b"domain", domain)));
}
element
}))?;
writer
.write(Event::Start({
let mut element = element.clone();
if let Some(ref domain) = self.domain {
element.extend_attributes(::std::iter::once((b"domain",
domain)));
}
element
}))?;

writer.write(Event::Text(Element::new(self.name
.as_str())))?;
writer.write(Event::Text(Element::new(self.name.as_str())))?;

writer.write(Event::End(element))
}
Expand Down Expand Up @@ -156,9 +151,7 @@ impl CategoryBuilder {
/// let mut category_builder = CategoryBuilder::new();
/// category_builder.name("Podcast");
/// ```
pub fn name(mut self,
name: &str)
-> CategoryBuilder {
pub fn name(mut self, name: &str) -> CategoryBuilder {
self.name = name.to_string();
self
}
Expand All @@ -173,9 +166,7 @@ impl CategoryBuilder {
/// let mut category_builder = CategoryBuilder::new();
/// category_builder.domain(Some("http://www.example.com".to_string()));
/// ```
pub fn domain(mut self,
domain: Option<String>)
-> CategoryBuilder {
pub fn domain(mut self, domain: Option<String>) -> CategoryBuilder {
self.domain = domain;
self
}
Expand Down Expand Up @@ -218,7 +209,9 @@ impl CategoryBuilder {
/// .unwrap();
/// ```
pub fn finalize(self) -> Result<Category, Error> {
Ok(Category { name: self.name,
domain: self.domain, })
Ok(Category {
name: self.name,
domain: self.domain,
})
}
}

0 comments on commit 593b7aa

Please sign in to comment.