A few small cleanups

Author: jtgeibel

src/admin/migrate.rs

@@ -39,7 +39,6 @@ pub fn run(_opts: Opts) -> Result<(), Error> {
     let conn = &mut crate::db::oneoff_connection_with_config(&config)?;
 
     info!("Migrating the database");
-    // let migrations = ;
     let mut stdout = std::io::stdout();
     let mut harness = HarnessWithOutput::new(conn, &mut stdout);
     harness

src/models/dependency.rs

@@ -1,6 +1,6 @@
 use diesel::deserialize::{self, FromSql};
 use diesel::pg::Pg;
-use diesel::sql_types::Integer;
+use diesel::sql_types::{Text, Integer};
 
 use crate::models::{Crate, Version};
 use crate::schema::*;
@@ -27,9 +27,9 @@ pub struct Dependency {
 pub struct ReverseDependency {
     #[diesel(embed)]
     pub dependency: Dependency,
-    #[diesel(sql_type = ::diesel::sql_types::Integer)]
+    #[diesel(sql_type = Integer)]
     pub crate_downloads: i32,
-    #[diesel(sql_type = ::diesel::sql_types::Text)]
+    #[diesel(sql_type = Text)]
     #[diesel(column_name = crate_name)]
     pub name: String,
 }

src/models/helpers/with_count.rs

@@ -1,8 +1,10 @@
+use diesel::sql_types::BigInt;
+
 #[derive(QueryableByName, Queryable, Debug)]
 pub struct WithCount<T> {
     #[diesel(embed)]
     pub(crate) record: T,
-    #[diesel(sql_type = ::diesel::sql_types::BigInt)]
+    #[diesel(sql_type = BigInt)]
     pub(crate) total: i64,
 }
 

src/swirl/runner.rs

@@ -405,7 +405,7 @@ mod tests {
 
     impl<'a> Drop for TestGuard<'a> {
         fn drop(&mut self) {
-            ::diesel::sql_query("TRUNCATE TABLE background_jobs")
+            diesel::sql_query("TRUNCATE TABLE background_jobs")
                 .execute(&mut *runner().connection().unwrap())
                 .unwrap();
         }
@@ -419,7 +419,7 @@ mod tests {
     }
 
     fn create_dummy_job(runner: &Runner) -> storage::BackgroundJob {
-        ::diesel::insert_into(background_jobs)
+        diesel::insert_into(background_jobs)
             .values((job_type.eq("Foo"), data.eq(serde_json::json!(null))))
             .returning((id, job_type, data))
             .get_result(&mut *runner.connection().unwrap())