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"),
         }
     }
 }

src/github.rs

@@ -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,
@@ -889,7 +872,7 @@ impl Issue {
         &self,
         client: &GithubClient,
         selection: Selection<'_, str>,
-    ) -> Result<(), AssignmentError> {
+    ) -> anyhow::Result<()> {
         log::info!("remove {:?} assignees for {}", selection, self.global_id());
         let url = format!(
             "{repo_url}/issues/{number}/assignees",
@@ -916,20 +899,18 @@ impl Issue {
         struct AssigneeReq<'a> {
             assignees: &'a [&'a str],
         }
+
         client
             .send_req(client.delete(&url).json(&AssigneeReq {
                 assignees: &assignees[..],
             }))
             .await
-            .map_err(AssignmentError::Http)?;
+            .context("failed to remove assignees")?;
+
         Ok(())
     }
 
-    pub async fn add_assignee(
-        &self,
-        client: &GithubClient,
-        user: &str,
-    ) -> Result<(), AssignmentError> {
+    pub async fn add_assignee(&self, client: &GithubClient, user: &str) -> anyhow::Result<()> {
         log::info!("add_assignee {} for {}", user, self.global_id());
         let url = format!(
             "{repo_url}/issues/{number}/assignees",
@@ -944,27 +925,23 @@ impl Issue {
 
         let result: Issue = client
             .json(client.post(&url).json(&AssigneeReq { assignees: &[user] }))
-            .await
-            .map_err(AssignmentError::Http)?;
+            .await?;
+
         // Invalid assignees are silently ignored. We can just check if the user is now
         // contained in the assignees list.
         let success = result
             .assignees
             .iter()
             .any(|u| u.login.as_str().to_lowercase() == user.to_lowercase());
 
-        if success {
-            Ok(())
-        } else {
-            Err(AssignmentError::InvalidAssignee)
+        if !success {
+            anyhow::bail!(UserError::InvalidAssignee);
         }
+
+        Ok(())
     }
 
-    pub async fn set_assignee(
-        &self,
-        client: &GithubClient,
-        user: &str,
-    ) -> Result<(), AssignmentError> {
+    pub async fn set_assignee(&self, client: &GithubClient, user: &str) -> anyhow::Result<()> {
         log::info!("set_assignee for {} to {}", self.global_id(), user);
         self.add_assignee(client, user).await?;
         self.remove_assignees(client, Selection::Except(user))

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, UserError, user_error};
 use crate::github::UserId;
 use crate::handlers::pr_tracking::ReviewerWorkqueue;
 use crate::{
@@ -656,7 +656,12 @@ pub(super) async fn handle_command(
                 e.apply(&ctx.github, String::new()).await?;
                 return Ok(());
             } // we are done
-            Err(github::AssignmentError::InvalidAssignee) => {
+            Err(err)
+                if matches!(
+                    err.downcast_ref::<UserError>(),
+                    Some(UserError::InvalidAssignee)
+                ) =>
+            {
                 issue
                     .set_assignee(&ctx.github, &ctx.username)
                     .await