Skip to content
This repository has been archived by the owner on Sep 24, 2022. It is now read-only.

Fix issues indicated by clippy #157

Merged
merged 5 commits into from
Apr 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/datetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,10 @@ impl FromStr for Datetime {
chars.clone().next() == Some('T') {
chars.next();
true
} else if full_date.is_none() {
true
} else {
false
full_date.is_none()
};

let time = if partial_time {
let h1 = digit(&mut chars)?;
let h2 = digit(&mut chars)?;
Expand Down Expand Up @@ -299,7 +298,7 @@ impl FromStr for Datetime {

fn digit(chars: &mut str::Chars) -> Result<u8, DatetimeParseError> {
match chars.next() {
Some(c) if '0' <= c && c <= '9' => Ok(c as u8 - '0' as u8),
Some(c) if '0' <= c && c <= '9' => Ok(c as u8 - b'0'),
_ => Err(DatetimeParseError { _private: () }),
}
}
Expand Down
26 changes: 13 additions & 13 deletions src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub fn from_str<T>(s: &str) -> Result<T, Error>
let mut d = Deserializer::new(s);
let ret = T::deserialize(&mut d)?;
d.end()?;
return Ok(ret)
Ok(ret)
}

/// Errors that can occur when deserializing a type.
Expand Down Expand Up @@ -148,7 +148,7 @@ impl<'a, 'b> de::Deserializer for &'b mut Deserializer<'a> {
while let Some(line) = self.line()? {
match line {
Line::Table { at, mut header, array } => {
if cur_table.header.len() > 0 || cur_table.values.is_some() {
if !cur_table.header.is_empty() || cur_table.values.is_some() {
tables.push(cur_table);
}
cur_table = Table {
Expand All @@ -175,7 +175,7 @@ impl<'a, 'b> de::Deserializer for &'b mut Deserializer<'a> {
}
}
}
if cur_table.header.len() > 0 || cur_table.values.is_some() {
if !cur_table.header.is_empty() || cur_table.values.is_some() {
tables.push(cur_table);
}

Expand Down Expand Up @@ -357,7 +357,7 @@ impl<'a, 'b> de::SeqVisitor for MapVisitor<'a, 'b> {
de: &mut self.de,
})?;
self.cur_parent = next;
return Ok(Some(ret))
Ok(Some(ret))
}
}

Expand Down Expand Up @@ -470,7 +470,7 @@ impl<'a> de::Deserializer for ValueDeserializer<'a> {
where V: de::Visitor,
{
if name == SERDE_STRUCT_NAME && fields == &[SERDE_STRUCT_FIELD_NAME] {
if let Value::Datetime(ref s) = self.value {
if let Value::Datetime(s) = self.value {
return visitor.visit_map(DatetimeDeserializer {
date: s,
visited: false,
Expand Down Expand Up @@ -687,7 +687,7 @@ impl<'a> Deserializer<'a> {
}

fn number_or_date(&mut self, s: &'a str) -> Result<Value<'a>, Error> {
if s.contains("T") || (s.len() > 1 && s[1..].contains("-")) &&
if s.contains('T') || (s.len() > 1 && s[1..].contains('-')) &&
!s.contains("e-") {
self.datetime(s, false).map(Value::Datetime)
} else if self.eat(Token::Colon)? {
Expand All @@ -698,7 +698,7 @@ impl<'a> Deserializer<'a> {
}

fn number(&mut self, s: &'a str) -> Result<Value<'a>, Error> {
if s.contains("e") || s.contains("E") {
if s.contains('e') || s.contains('E') {
self.float(s, None).map(Value::Float)
} else if self.eat(Token::Period)? {
let at = self.tokens.current();
Expand Down Expand Up @@ -727,7 +727,7 @@ impl<'a> Deserializer<'a> {
if suffix != "" {
return Err(self.error(start, ErrorKind::NumberInvalid))
}
prefix.replace("_", "").trim_left_matches("+").parse().map_err(|_e| {
prefix.replace("_", "").trim_left_matches('+').parse().map_err(|_e| {
self.error(start, ErrorKind::NumberInvalid)
})
}
Expand Down Expand Up @@ -783,13 +783,13 @@ impl<'a> Deserializer<'a> {
if suffix != "" {
return Err(self.error(start, ErrorKind::NumberInvalid))
}
let (a, b) = self.parse_integer(&after, false, true)?;
let (a, b) = self.parse_integer(after, false, true)?;
fraction = Some(a);
suffix = b;
}

let mut exponent = None;
if suffix.starts_with("e") || suffix.starts_with("E") {
if suffix.starts_with('e') || suffix.starts_with('E') {
let (a, b) = if suffix.len() == 1 {
self.eat(Token::Plus)?;
match self.next()? {
Expand All @@ -807,7 +807,7 @@ impl<'a> Deserializer<'a> {
exponent = Some(a);
}

let mut number = integral.trim_left_matches("+")
let mut number = integral.trim_left_matches('+')
.chars()
.filter(|c| *c != '_')
.collect::<String>();
Expand Down Expand Up @@ -1003,7 +1003,7 @@ impl<'a> Deserializer<'a> {
let (line, col) = self.to_linecol(at);
err.inner.line = Some(line);
err.inner.col = col;
return err
err
}

/// Converts a byte offset from an error message to a (line, column) pair
Expand Down Expand Up @@ -1095,7 +1095,7 @@ impl fmt::Display for Error {
ErrorKind::__Nonexhaustive => panic!(),
}

if self.inner.key.len() > 0 {
if !self.inner.key.is_empty() {
write!(f, " for key `")?;
for (i, k) in self.inner.key.iter().enumerate() {
if i > 0 {
Expand Down
10 changes: 5 additions & 5 deletions src/ser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ impl<'a> Serializer<'a> {
if array_of_tables {
self.dst.push_str("[");
}
self.emit_key_part(&state)?;
self.emit_key_part(state)?;
if array_of_tables {
self.dst.push_str("]");
}
Expand Down Expand Up @@ -563,7 +563,7 @@ impl<'a, 'b> ser::SerializeMap for SerializeTable<'a, 'b> {
SerializeTable::Table { ref mut key, .. } => {
key.truncate(0);
*key = input.serialize(StringExtractor)?;
if key.contains("\n") {
if key.contains('\n') {
return Err(Error::KeyNewline)
}
}
Expand All @@ -586,10 +586,10 @@ impl<'a, 'b> ser::SerializeMap for SerializeTable<'a, 'b> {
let res = value.serialize(&mut Serializer {
dst: &mut *ser.dst,
state: State::Table {
key: &key,
key: key,
parent: &ser.state,
first: &first,
table_emitted: &table_emitted,
first: first,
table_emitted: table_emitted,
},
});
match res {
Expand Down
6 changes: 3 additions & 3 deletions src/tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ impl<'a> Tokenizer<'a> {
};
// Eat utf-8 BOM
t.eatc('\u{feff}');
return t
t
}

pub fn next(&mut self) -> Result<Option<Token<'a>>, Error> {
Expand Down Expand Up @@ -141,7 +141,7 @@ impl<'a> Tokenizer<'a> {
if val == "" {
return Err(Error::EmptyTableKey(offset))
}
match src.find("\n") {
match src.find('\n') {
None => Ok(val),
Some(i) => Err(Error::NewlineInTableKey(offset + i)),
}
Expand Down Expand Up @@ -422,7 +422,7 @@ impl MaybeString {
}
}

fn into_cow<'a>(self, input: &'a str) -> Cow<'a, str> {
fn into_cow(self, input: &str) -> Cow<str> {
match self {
MaybeString::NotEscaped(start) => Cow::Borrowed(&input[start..]),
MaybeString::Owned(s) => Cow::Owned(s),
Expand Down
2 changes: 1 addition & 1 deletion tests/valid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn to_json(toml: toml::Value) -> Json {
Toml::Float(f) => doit("float", Json::String({
let s = format!("{:.15}", f);
let s = format!("{}", s.trim_right_matches('0'));
if s.ends_with(".") {format!("{}0", s)} else {s}
if s.ends_with('.') {format!("{}0", s)} else {s}
})),
Toml::Boolean(b) => doit("bool", Json::String(format!("{}", b))),
Toml::Datetime(s) => doit("datetime", Json::String(s.to_string())),
Expand Down