address some clippy and such

Author: foxfriends

dev/check-localization/src/main.rs

@@ -19,7 +19,7 @@ fn main() -> io::Result<()> {
         for key in keys {
             discovered_keys
                 .entry(key)
-                .or_insert(BTreeSet::default())
+                .or_default()
                 .insert(name.to_owned());
         }
     }

dev/import-conventions/src/main.rs

@@ -38,7 +38,7 @@ fn main() -> io::Result<()> {
     let save_ids = env::var("SAVE_IDS").map(|s| s == "true").unwrap_or(false);
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     let mut connection = PgConnection::establish(&database_url)
-        .expect(&format!("Error connecting to {}", database_url));
+        .unwrap_or_else(|_| panic!("Error connecting to {}", database_url));
 
     let export = env::var("DO_EXPORT_INSTEAD")
         .map(|s| s == "true")

dev/localization-to-android/src/main.rs

@@ -1,4 +1,4 @@
-use std::io::{self, stdin, Read};
+use std::io::{self, Read, stdin};
 use toml::Value;
 use treexml::{Document, ElementBuilder as E};
 
@@ -26,7 +26,7 @@ fn main() -> io::Result<()> {
     let toml_document = toml::from_str::<toml::Value>(&contents).unwrap();
     let table = toml_document.as_table().unwrap();
     let mut children: Vec<_> = table
-        .into_iter()
+        .iter()
         .map(|(name, value)| (sanitize(name), value))
         .map(|(name, value)| {
             let string = match value {

server/src/database/account.rs

@@ -1,4 +1,3 @@
-use bcrypt;
 use diesel::dsl;
 use diesel::prelude::*;
 

server/src/database/conventions.rs

@@ -48,8 +48,7 @@ impl Database {
             .filter(conventionsearch::end_date.ge(date))
             .offset(
                 after
-                    .clone()
-                    .and_then(|offset| str::parse(&offset).ok())
+                    .and_then(|offset| str::parse(offset).ok())
                     .unwrap_or(0i64),
             )
             .limit(limit)

server/src/database/conversions.rs

@@ -7,9 +7,9 @@ use diesel::sql_types::Text;
 use std::io::Write;
 use std::str::FromStr;
 
-impl Into<i64> for Money {
-    fn into(self) -> i64 {
-        self.amt()
+impl From<Money> for i64 {
+    fn from(val: Money) -> Self {
+        val.amt()
     }
 }
 

server/src/database/creaters.rs

@@ -1,7 +1,6 @@
 use chrono::{NaiveDate, Utc};
 use diesel::prelude::*;
 use diesel::{self, dsl};
-use serde_json;
 
 use super::Database;
 use super::models::*;
@@ -49,7 +48,7 @@ impl Database {
                         .filter(conventions::con_id.eq(con_id))
                         .first::<DetachedConvention>(conn)?;
 
-                if convention.end_date.and_hms(23, 59, 59) < Utc::now().naive_utc() {
+                if convention.end_date.and_hms_opt(23, 59, 59).unwrap() < Utc::now().naive_utc() {
                     return Err(
                         diesel::result::Error::DeserializationError(
                             Box::new(
@@ -169,7 +168,6 @@ impl Database {
                     conventionextrainfo::action_text.eq(action_text),
                 ))
                 .get_result::<ConventionExtraInfo>(conn)
-                .map(Into::into)
         })
         .map_err(|reason| {
             format!(

server/src/database/getters.rs

@@ -50,7 +50,7 @@ impl Database {
     pub fn get_prices_for_user(&self, maybe_user_id: Option<i32>) -> Result<Vec<Price>, String> {
         let user_id = self.resolve_user_id_protected(maybe_user_id)?;
         let mut conn = self.pool.get().unwrap();
-        return prices::table
+        prices::table
             .inner_join(
                 currentprices::table.on(prices::type_id
                     .eq(currentprices::type_id)
@@ -73,7 +73,7 @@ impl Database {
                     .into_iter()
                     .filter(|price| price.price.is_some())
                     .collect()
-            });
+            })
     }
 
     pub fn get_conventions_for_user(
@@ -122,7 +122,7 @@ impl Database {
                 )
             })?;
 
-        let date = end_date.and_hms(23, 59, 59);
+        let date = end_date.and_hms_opt(23, 59, 59).unwrap();
 
         // TODO: was nice when the counting could be done in SQL... maybe someday it can be improved
         let items_sold: HashMap<i32, i64> = records::table
@@ -241,8 +241,8 @@ impl Database {
                 )
             })?;
 
-        let date = end_date.and_hms(23, 59, 59);
-        return prices::table
+        let date = end_date.and_hms_opt(23, 59, 59).unwrap();
+        prices::table
             .inner_join(
                 currentprices::table.on(prices::type_id
                     .eq(currentprices::type_id)
@@ -271,6 +271,6 @@ impl Database {
                     .into_iter()
                     .filter(|price| price.price.is_some())
                     .collect()
-            });
+            })
     }
 }

server/src/database/models/convention.rs

@@ -21,11 +21,11 @@ pub struct RawConventionUserInfo {
     pub information: String,
 }
 
-impl Into<ConventionUserInfo> for RawConventionUserInfo {
-    fn into(self) -> ConventionUserInfo {
+impl From<RawConventionUserInfo> for ConventionUserInfo {
+    fn from(val: RawConventionUserInfo) -> Self {
         ConventionUserInfo {
-            con_info_id: self.con_info_id,
-            information: self.information,
+            con_info_id: val.con_info_id,
+            information: val.information,
             upvotes: 0i32,
             downvotes: 0i32,
         }
@@ -79,15 +79,15 @@ impl DetachedConvention {
     }
 }
 
-impl Into<Convention> for DetachedConvention {
-    fn into(self) -> Convention {
+impl From<DetachedConvention> for Convention {
+    fn from(val: DetachedConvention) -> Self {
         Convention {
-            con_id: self.con_id,
+            con_id: val.con_id,
             user_id: None,
-            title: self.title,
-            start_date: self.start_date,
-            end_date: self.end_date,
-            predecessor: self.predecessor,
+            title: val.title,
+            start_date: val.start_date,
+            end_date: val.end_date,
+            predecessor: val.predecessor,
         }
     }
 }

server/src/database/models/time.rs

@@ -21,7 +21,7 @@ impl FromSql<Text, Pg> for Time {
 
 impl ToSql<Text, Pg> for Time {
     fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
-        out.write_all(&self.0.to_rfc3339().as_bytes())?;
+        out.write_all(self.0.to_rfc3339().as_bytes())?;
         Ok(serialize::IsNull::No)
     }
 }