Downgrade more return types from AppResult to QueryResult

Author: jtgeibel

src/models/krate.rs

@@ -384,7 +384,7 @@ impl Crate {
         }
     }
 
-    pub fn max_version(&self, conn: &PgConnection) -> AppResult<semver::Version> {
+    pub fn max_version(&self, conn: &PgConnection) -> QueryResult<semver::Version> {
         use crate::schema::versions::dsl::*;
 
         let vs = self
@@ -396,7 +396,7 @@ impl Crate {
         Ok(Version::max(vs))
     }
 
-    pub fn owners(&self, conn: &PgConnection) -> AppResult<Vec<Owner>> {
+    pub fn owners(&self, conn: &PgConnection) -> QueryResult<Vec<Owner>> {
         let users = CrateOwner::by_owner_kind(OwnerKind::User)
             .filter(crate_owners::crate_id.eq(self.id))
             .inner_join(users::table)

src/models/team.rs

@@ -173,7 +173,7 @@ impl Team {
         team_with_gh_id_contains_user(app, self.github_id, user)
     }
 
-    pub fn owning(krate: &Crate, conn: &PgConnection) -> AppResult<Vec<Owner>> {
+    pub fn owning(krate: &Crate, conn: &PgConnection) -> QueryResult<Vec<Owner>> {
         let base_query = CrateOwner::belonging_to(krate).filter(crate_owners::deleted.eq(false));
         let teams = base_query
             .inner_join(teams::table)

src/models/user.rs

@@ -116,7 +116,7 @@ impl User {
         Self::find(conn, api_token.user_id)
     }
 
-    pub fn owning(krate: &Crate, conn: &PgConnection) -> AppResult<Vec<Owner>> {
+    pub fn owning(krate: &Crate, conn: &PgConnection) -> QueryResult<Vec<Owner>> {
         let users = CrateOwner::by_owner_kind(OwnerKind::User)
             .inner_join(users::table)
             .select(users::all_columns)
@@ -157,7 +157,7 @@ impl User {
 
     /// Queries the database for the verified emails
     /// belonging to a given user
-    pub fn verified_email(&self, conn: &PgConnection) -> AppResult<Option<String>> {
+    pub fn verified_email(&self, conn: &PgConnection) -> QueryResult<Option<String>> {
         Ok(Email::belonging_to(self)
             .select(emails::email)
             .filter(emails::verified.eq(true))

src/publish_rate_limit.rs

@@ -55,7 +55,7 @@ impl PublishRateLimit {
         uploader: i32,
         now: NaiveDateTime,
         conn: &PgConnection,
-    ) -> AppResult<Bucket> {
+    ) -> QueryResult<Bucket> {
         use self::publish_limit_buckets::dsl::*;
         use diesel::sql_types::{Double, Interval, Text, Timestamp};
 
@@ -93,7 +93,6 @@ impl PublishRateLimit {
                     .eq(last_refill + self.refill_rate().into_sql::<Interval>() * tokens_to_add),
             ))
             .get_result(conn)
-            .map_err(Into::into)
     }
 
     fn refill_rate(&self) -> PgInterval {
@@ -108,7 +107,7 @@ mod tests {
     use crate::test_util::*;
 
     #[test]
-    fn take_token_with_no_bucket_creates_new_one() -> AppResult<()> {
+    fn take_token_with_no_bucket_creates_new_one() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -139,7 +138,7 @@ mod tests {
     }
 
     #[test]
-    fn take_token_with_existing_bucket_modifies_existing_bucket() -> AppResult<()> {
+    fn take_token_with_existing_bucket_modifies_existing_bucket() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -159,7 +158,7 @@ mod tests {
     }
 
     #[test]
-    fn take_token_after_delay_refills() -> AppResult<()> {
+    fn take_token_after_delay_refills() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -180,12 +179,13 @@ mod tests {
     }
 
     #[test]
-    fn refill_subsecond_rate() -> AppResult<()> {
+    fn refill_subsecond_rate() -> QueryResult<()> {
         let conn = pg_connection();
         // Subsecond rates have floating point rounding issues, so use a known
         // timestamp that rounds fine
         let now =
-            NaiveDateTime::parse_from_str("2019-03-19T21:11:24.620401", "%Y-%m-%dT%H:%M:%S%.f")?;
+            NaiveDateTime::parse_from_str("2019-03-19T21:11:24.620401", "%Y-%m-%dT%H:%M:%S%.f")
+                .unwrap();
 
         let rate = PublishRateLimit {
             rate: Duration::from_millis(100),
@@ -204,7 +204,7 @@ mod tests {
     }
 
     #[test]
-    fn last_refill_always_advanced_by_multiple_of_rate() -> AppResult<()> {
+    fn last_refill_always_advanced_by_multiple_of_rate() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -225,7 +225,7 @@ mod tests {
     }
 
     #[test]
-    fn zero_tokens_returned_when_user_has_no_tokens_left() -> AppResult<()> {
+    fn zero_tokens_returned_when_user_has_no_tokens_left() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -248,7 +248,7 @@ mod tests {
     }
 
     #[test]
-    fn a_user_with_no_tokens_gets_a_token_after_exactly_rate() -> AppResult<()> {
+    fn a_user_with_no_tokens_gets_a_token_after_exactly_rate() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -270,7 +270,7 @@ mod tests {
     }
 
     #[test]
-    fn tokens_never_refill_past_burst() -> AppResult<()> {
+    fn tokens_never_refill_past_burst() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -292,7 +292,7 @@ mod tests {
     }
 
     #[test]
-    fn override_is_used_instead_of_global_burst_if_present() -> AppResult<()> {
+    fn override_is_used_instead_of_global_burst_if_present() -> QueryResult<()> {
         let conn = pg_connection();
         let now = now();
 
@@ -318,7 +318,7 @@ mod tests {
         Ok(())
     }
 
-    fn new_user(conn: &PgConnection, gh_login: &str) -> AppResult<i32> {
+    fn new_user(conn: &PgConnection, gh_login: &str) -> QueryResult<i32> {
         use crate::models::NewUser;
 
         let user = NewUser {
@@ -329,15 +329,18 @@ mod tests {
         Ok(user.id)
     }
 
-    fn new_user_bucket(conn: &PgConnection, tokens: i32, now: NaiveDateTime) -> AppResult<Bucket> {
+    fn new_user_bucket(
+        conn: &PgConnection,
+        tokens: i32,
+        now: NaiveDateTime,
+    ) -> QueryResult<Bucket> {
         diesel::insert_into(publish_limit_buckets::table)
             .values(Bucket {
                 user_id: new_user(conn, "new_user")?,
                 tokens,
                 last_refill: now,
             })
             .get_result(conn)
-            .map_err(Into::into)
     }
 
     /// Strips ns precision from `Utc::now`. PostgreSQL only has microsecond