Clippy

Plume-org · Jan 6, 2023 · 4f796e7 · 4f796e7
1 parent 3d192c1
commit 4f796e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs
@@ -756,7 +756,7 @@ impl FromId<DbConn> for Post {
                             let timestamp_secs = published.unix_timestamp();
                             let timestamp_nanos = published.unix_timestamp_nanos()
                                 - (timestamp_secs as i128) * 1000i128 * 1000i128 * 1000i128;
-                            NaiveDateTime::from_timestamp(timestamp_secs, timestamp_nanos as u32)
+                            NaiveDateTime::from_timestamp_opt(timestamp_secs, timestamp_nanos as u32).unwrap()
                         }),
                         subtitle: article
                             .summary()

diff --git a/plume-models/src/search/query.rs b/plume-models/src/search/query.rs
@@ -94,7 +94,7 @@ macro_rules! gen_to_string {
         )*
         $(
         for val in &$self.$date {
-            $result.push_str(&format!("{}:{} ", stringify!($date), NaiveDate::from_num_days_from_ce(*val as i32).format("%Y-%m-%d")));
+            $result.push_str(&format!("{}:{} ", stringify!($date), NaiveDate::from_num_days_from_ce_opt(*val as i32).unwrap().format("%Y-%m-%d")));
         }
         )*
     }
@@ -182,10 +182,10 @@ impl PlumeQuery {
             // if at least one range bound is provided
             let after = self
                 .after
-                .unwrap_or_else(|| i64::from(NaiveDate::from_ymd(2000, 1, 1).num_days_from_ce()));
+                .unwrap_or_else(|| i64::from(NaiveDate::from_ymd_opt(2000, 1, 1).unwrap().num_days_from_ce()));
             let before = self
                 .before
-                .unwrap_or_else(|| i64::from(Utc::today().num_days_from_ce()));
+                .unwrap_or_else(|| i64::from(Utc::now().date_naive().num_days_from_ce()));
             let field = Searcher::schema().get_field("creation_date").unwrap();
             let range =
                 RangeQuery::new_i64_bounds(field, Bound::Included(after), Bound::Included(before));
@@ -202,7 +202,7 @@ impl PlumeQuery {
     pub fn before<D: Datelike>(&mut self, date: &D) -> &mut Self {
         let before = self
             .before
-            .unwrap_or_else(|| i64::from(Utc::today().num_days_from_ce()));
+            .unwrap_or_else(|| i64::from(Utc::now().date_naive().num_days_from_ce()));
         self.before = Some(cmp::min(before, i64::from(date.num_days_from_ce())));
         self
     }
@@ -211,7 +211,7 @@ impl PlumeQuery {
     pub fn after<D: Datelike>(&mut self, date: &D) -> &mut Self {
         let after = self
             .after
-            .unwrap_or_else(|| i64::from(NaiveDate::from_ymd(2000, 1, 1).num_days_from_ce()));
+            .unwrap_or_else(|| i64::from(NaiveDate::from_ymd_opt(2000, 1, 1).unwrap().num_days_from_ce()));
         self.after = Some(cmp::max(after, i64::from(date.num_days_from_ce())));
         self
     }

diff --git a/src/routes/search.rs b/src/routes/search.rs
@@ -65,7 +65,7 @@ pub fn search(query: Option<Form<SearchQuery>>, conn: DbConn, rockets: PlumeRock
     if str_query.is_empty() {
         render!(search::index(
             &(&conn, &rockets).to_context(),
-            &format!("{}", Utc::today().format("%Y-%m-d"))
+            &format!("{}", Utc::now().date_naive().format("%Y-%m-d"))
         ))
     } else {
         let res = rockets