Move InvalidAssignee to UserError

Author: Urgau

src/errors.rs

@@ -18,6 +18,8 @@ pub enum UserError {
     Message(String),
     /// Unknown labels
     UnknownLabels { labels: Vec<String> },
+    /// Invalid assignee
+    InvalidAssignee,
 }
 
 impl std::error::Error for UserError {}
@@ -30,6 +32,7 @@ impl fmt::Display for UserError {
             UserError::UnknownLabels { labels } => {
                 write!(f, "Unknown labels: {}", labels.join(", "))
             }
+            UserError::InvalidAssignee => write!(f, "invalid assignee"),
         }
     }
 }
@@ -76,6 +79,32 @@ where
     }
 }
 
+/// Represent an error when trying to assign someone
+#[derive(Debug)]
+pub enum AssignmentError {
+    InvalidAssignee,
+    Other(anyhow::Error),
+}
+
+// NOTE: This is used to post the Github comment; make sure it's valid markdown.
+impl fmt::Display for AssignmentError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            AssignmentError::InvalidAssignee => write!(f, "invalid assignee"),
+            AssignmentError::Other(err) => write!(f, "{err}"),
+        }
+    }
+}
+
+impl From<AssignmentError> for anyhow::Error {
+    fn from(a: AssignmentError) -> Self {
+        match a {
+            AssignmentError::InvalidAssignee => UserError::InvalidAssignee.into(),
+            AssignmentError::Other(err) => err.context("assignment error"),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/github.rs

@@ -1,4 +1,4 @@
-use crate::errors::UserError;
+use crate::errors::{AssignmentError, UserError};
 use crate::team_data::TeamClient;
 use anyhow::Context;
 use async_trait::async_trait;
@@ -547,30 +547,13 @@ where
     }
 }
 
-#[derive(Debug)]
-pub enum AssignmentError {
-    InvalidAssignee,
-    Http(anyhow::Error),
-}
-
 #[derive(Debug)]
 pub enum Selection<'a, T: ?Sized> {
     All,
     One(&'a T),
     Except(&'a T),
 }
 
-impl fmt::Display for AssignmentError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            AssignmentError::InvalidAssignee => write!(f, "invalid assignee"),
-            AssignmentError::Http(e) => write!(f, "cannot assign: {e}"),
-        }
-    }
-}
-
-impl std::error::Error for AssignmentError {}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct IssueRepository {
     pub organization: String,
@@ -916,12 +899,14 @@ impl Issue {
         struct AssigneeReq<'a> {
             assignees: &'a [&'a str],
         }
+
         client
             .send_req(client.delete(&url).json(&AssigneeReq {
                 assignees: &assignees[..],
             }))
             .await
-            .map_err(AssignmentError::Http)?;
+            .map_err(AssignmentError::Other)?;
+
         Ok(())
     }
 
@@ -945,7 +930,8 @@ impl Issue {
         let result: Issue = client
             .json(client.post(&url).json(&AssigneeReq { assignees: &[user] }))
             .await
-            .map_err(AssignmentError::Http)?;
+            .map_err(AssignmentError::Other)?;
+
         // Invalid assignees are silently ignored. We can just check if the user is now
         // contained in the assignees list.
         let success = result

src/handlers/assign.rs

@@ -22,7 +22,7 @@
 
 use crate::db::issue_data::IssueData;
 use crate::db::review_prefs::{RotationMode, get_review_prefs_batch};
-use crate::errors::{self, user_error};
+use crate::errors::{self, AssignmentError, user_error};
 use crate::github::UserId;
 use crate::handlers::pr_tracking::ReviewerWorkqueue;
 use crate::{
@@ -656,11 +656,8 @@ pub(super) async fn handle_command(
                 e.apply(&ctx.github, String::new()).await?;
                 return Ok(());
             } // we are done
-            Err(github::AssignmentError::InvalidAssignee) => {
-                issue
-                    .set_assignee(&ctx.github, &ctx.username)
-                    .await
-                    .context("self-assignment failed")?;
+            Err(AssignmentError::InvalidAssignee) => {
+                issue.set_assignee(&ctx.github, &ctx.username).await?;
                 let cmt_body = format!(
                     "This issue has been assigned to @{to_assign} via [this comment]({}).",
                     event.html_url().unwrap()