summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKartikaya Gupta <kats@seldon.staktrace.com>2016-10-02 16:02:44 -0400
committerKartikaya Gupta <kats@seldon.staktrace.com>2016-10-02 16:03:03 -0400
commit1adc00566741cb2ffe0c679efea777d5e318c1ae (patch)
tree84bd16b0b84c5abfc1fe87ac1946df8be75bb1c1 /src
parentfe752e6434cdf75c00600d657855b43caf1927c0 (diff)
rustfmt
Diffstat (limited to 'src')
-rw-r--r--src/dateparse.rs38
-rw-r--r--src/lib.rs18
2 files changed, 33 insertions, 23 deletions
diff --git a/src/dateparse.rs b/src/dateparse.rs
index 786fc1e..f699216 100644
--- a/src/dateparse.rs
+++ b/src/dateparse.rs
@@ -22,13 +22,13 @@ fn days_in_month(month: i64, year: i64) -> i64 {
} else {
28
}
- },
+ }
_ => 0,
}
}
fn seconds_to_date(year: i64, month: i64, day: i64) -> i64 {
- let mut result : i64 = 0;
+ let mut result: i64 = 0;
for y in 1970..2001 {
if y == year {
break;
@@ -88,11 +88,11 @@ pub fn dateparse(date: &str) -> Result<i64, &'static str> {
Ok(v) => {
day_of_month = v;
state = DateParseState::Month;
- },
+ }
Err(_) => (),
};
continue;
- },
+ }
DateParseState::Month => {
month = match tok.to_uppercase().as_str() {
"JAN" | "JANUARY" => 0,
@@ -111,7 +111,7 @@ pub fn dateparse(date: &str) -> Result<i64, &'static str> {
};
state = DateParseState::Year;
continue;
- },
+ }
DateParseState::Year => {
let year = match tok.parse::<u32>() {
Ok(v) if v < 70 => 2000 + v,
@@ -123,7 +123,7 @@ pub fn dateparse(date: &str) -> Result<i64, &'static str> {
result = seconds_to_date(year as i64, month as i64, day_of_month as i64);
state = DateParseState::Hour;
continue;
- },
+ }
DateParseState::Hour => {
let hour = match tok.parse::<u8>() {
Ok(v) => v,
@@ -132,7 +132,7 @@ pub fn dateparse(date: &str) -> Result<i64, &'static str> {
result += 3600 * (hour as i64);
state = DateParseState::Minute;
continue;
- },
+ }
DateParseState::Minute => {
let minute = match tok.parse::<u8>() {
Ok(v) => v,
@@ -141,7 +141,7 @@ pub fn dateparse(date: &str) -> Result<i64, &'static str> {
result += 60 * (minute as i64);
state = DateParseState::Second;
continue;
- },
+ }
DateParseState::Second => {
let second = match tok.parse::<u8>() {
Ok(v) => v,
@@ -150,7 +150,7 @@ pub fn dateparse(date: &str) -> Result<i64, &'static str> {
result += second as i64;
state = DateParseState::Timezone;
continue;
- },
+ }
DateParseState::Timezone => {
let (tz, tz_sign) = match tok.parse::<i32>() {
Ok(v) if v < 0 => (-v, -1),
@@ -181,7 +181,7 @@ pub fn dateparse(date: &str) -> Result<i64, &'static str> {
result -= tz_delta as i64;
}
break;
- },
+ }
}
}
Ok(result)
@@ -193,12 +193,18 @@ mod tests {
#[test]
fn parse_dates() {
- assert_eq!(dateparse("Sun, 25 Sep 2016 18:36:33 -0400").unwrap(), 1474842993);
- assert_eq!(dateparse("Fri, 01 Jan 2100 11:12:13 +0000").unwrap(), 4102485133);
- assert_eq!(dateparse("Fri, 31 Dec 2100 00:00:00 +0000").unwrap(), 4133894400);
- assert_eq!(dateparse("Fri, 31 Dec 2399 00:00:00 +0000").unwrap(), 13569379200);
- assert_eq!(dateparse("Fri, 31 Dec 2400 00:00:00 +0000").unwrap(), 13601001600);
+ assert_eq!(dateparse("Sun, 25 Sep 2016 18:36:33 -0400").unwrap(),
+ 1474842993);
+ assert_eq!(dateparse("Fri, 01 Jan 2100 11:12:13 +0000").unwrap(),
+ 4102485133);
+ assert_eq!(dateparse("Fri, 31 Dec 2100 00:00:00 +0000").unwrap(),
+ 4133894400);
+ assert_eq!(dateparse("Fri, 31 Dec 2399 00:00:00 +0000").unwrap(),
+ 13569379200);
+ assert_eq!(dateparse("Fri, 31 Dec 2400 00:00:00 +0000").unwrap(),
+ 13601001600);
assert_eq!(dateparse("17 Sep 2016 16:05:38 -1000").unwrap(), 1474164338);
- assert_eq!(dateparse("Fri, 30 Nov 2012 20:57:23 GMT").unwrap(), 1354309043);
+ assert_eq!(dateparse("Fri, 30 Nov 2012 20:57:23 GMT").unwrap(),
+ 1354309043);
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 1d59f69..ee2a038 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -168,7 +168,7 @@ impl<'a> MailHeader<'a> {
let to_decode = input.replace("_", " ");
let trimmed = to_decode.trim_right();
let mut d = quoted_printable::decode_str(&trimmed,
- quoted_printable::ParseMode::Robust);
+ quoted_printable::ParseMode::Robust);
if d.is_ok() && to_decode.len() != trimmed.len() {
d.as_mut().unwrap().extend_from_slice(to_decode[trimmed.len()..].as_bytes());
}
@@ -813,15 +813,20 @@ mod tests {
=?utf-8?q?uick_survey?=")
.unwrap();
assert_eq!(parsed.get_key().unwrap(), "Subject");
- assert_eq!(parsed.get_value().unwrap(), "[Ontario Builder] Understanding home shopping \u{2013} a q uick survey");
+ assert_eq!(parsed.get_value().unwrap(),
+ "[Ontario Builder] Understanding home shopping \u{2013} a q uick survey");
- let (parsed, _) = parse_header(b"Content-Type: image/jpeg; name=\"=?UTF-8?B?MDY2MTM5ODEuanBn?=\"").unwrap();
+ let (parsed, _) =
+ parse_header(b"Content-Type: image/jpeg; name=\"=?UTF-8?B?MDY2MTM5ODEuanBn?=\"")
+ .unwrap();
assert_eq!(parsed.get_key().unwrap(), "Content-Type");
- assert_eq!(parsed.get_value().unwrap(), "image/jpeg; name=\"06613981.jpg\"");
+ assert_eq!(parsed.get_value().unwrap(),
+ "image/jpeg; name=\"06613981.jpg\"");
let (parsed, _) = parse_header(b"From: =?UTF-8?Q?\"Motorola_Owners=E2=80=99_Forums\"_?=<forums@motorola.com>").unwrap();
assert_eq!(parsed.get_key().unwrap(), "From");
- assert_eq!(parsed.get_value().unwrap(), "\"Motorola Owners\u{2019} Forums\" <forums@motorola.com>");
+ assert_eq!(parsed.get_value().unwrap(),
+ "\"Motorola Owners\u{2019} Forums\" <forums@motorola.com>");
}
#[test]
@@ -965,8 +970,7 @@ mod tests {
.unwrap();
assert_eq!(mail.get_body().unwrap(), "hello world");
- let mail = parse_mail(b"ConTENT-tyPE: text/html\r\n\r\nhello world")
- .unwrap();
+ let mail = parse_mail(b"ConTENT-tyPE: text/html\r\n\r\nhello world").unwrap();
assert_eq!(mail.ctype.mimetype, "text/html");
assert_eq!(mail.get_body().unwrap(), "hello world");
}