emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix Clippy warnings (#886)

Browse source 
This addresses the following Clippy warnings:

* clippy::option_and_then_some
* clippy::useless_format
This commit is contained in:
Sam Ford 2019-12-19 03:43:06 -05:00 committed by Vincent Prouillet
parent 8e3f1f59f6
commit 0a0b6a3ad4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/front_matter/src/page.rs
View file

@ -87,11 +87,11 @@ impl PageFrontMatter {
pub fn date_to_datetime(&mut self) { pub fn date_to_datetime(&mut self) {
self.datetime = if let Some(ref d) = self.date { self.datetime = if let Some(ref d) = self.date {
if d.contains('T') { if d.contains('T') {
DateTime::parse_from_rfc3339(&d).ok().and_then(|s| Some(s.naive_local())) DateTime::parse_from_rfc3339(&d).ok().map(|s| s.naive_local())
} else { } else {
NaiveDate::parse_from_str(&d, "%Y-%m-%d") NaiveDate::parse_from_str(&d, "%Y-%m-%d")
.ok() .ok()
.and_then(|s| Some(s.and_hms(0, 0, 0))) .map(|s| s.and_hms(0, 0, 0))
} }
} else { } else {
None None

2
components/library/src/pagination/mod.rs
View file

@ -190,7 +190,7 @@ impl<'a> Paginator<'a> {
} }
paginator.insert("number_pagers", to_value(&self.pagers.len()).unwrap()); paginator.insert("number_pagers", to_value(&self.pagers.len()).unwrap());
let base_url = if self.paginate_path.is_empty() { let base_url = if self.paginate_path.is_empty() {
format!("{}", self.permalink) self.permalink.to_string()
} else { } else {
format!("{}{}/", self.permalink, self.paginate_path) format!("{}{}/", self.permalink, self.paginate_path)
}; };