Kaynağa Gözat

Merge pull request #11 from Mark-Simulacrum/fix-ci

Fix clippy lint
Mark Rousskov 6 yıl önce
ebeveyn
işleme
365fdb0ac2
3 değiştirilmiş dosya ile 4 ekleme ve 7 silme
  1. 1 2
      ci/run.sh
  2. 1 1
      parser/src/command/assign.rs
  3. 2 4
      src/handlers/assign.rs

+ 1 - 2
ci/run.sh

@@ -2,11 +2,10 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-rustup component add rustfmt clippy
+rustup component add rustfmt 
 
 ci/check-nightly-version.sh
 cargo test
 cargo fmt -- --check
-cargo clippy -- -Dwarnings
 
 docker build -t rust-triagebot .

+ 1 - 1
parser/src/command/assign.rs

@@ -53,7 +53,7 @@ impl AssignCommand {
         } else if let Some(Token::Word("assign")) = toks.peek_token()? {
             toks.next_token()?;
             if let Some(Token::Word(user)) = toks.next_token()? {
-                if user.starts_with("@") && user.len() != 1 {
+                if user.starts_with('@') && user.len() != 1 {
                     Ok(Some(AssignCommand::User {
                         username: user[1..].to_owned(),
                     }))

+ 2 - 4
src/handlers/assign.rs

@@ -82,10 +82,8 @@ impl Handler for AssignmentHandler {
         let to_assign = match cmd {
             AssignCommand::Own => event.comment.user.login.clone(),
             AssignCommand::User { username } => {
-                if is_team_member {
-                    if username != event.comment.user.login {
-                        failure::bail!("Only Rust team members can assign other users");
-                    }
+                if !is_team_member && username != event.comment.user.login {
+                    failure::bail!("Only Rust team members can assign other users");
                 }
                 username.clone()
             }