Merge pull request #561 from m-ou-se/clippy-sad

Make clippy happy.

Author: Manishearth

rust_team_data/src/email_encryption.rs

@@ -55,7 +55,7 @@ pub fn try_decrypt(key: &str, email: &str) -> Result<String, Error> {
             .decrypt(&nonce, encrypted)
             .map_err(|_| Error::EncryptionFailed)?,
     )
-    .map_err(|_| Error::InvalidUTF8)
+    .map_err(|_| Error::InvalidUtf8)
 }
 
 fn init_cipher(key: &str) -> Result<XChaCha20Poly1305, Error> {
@@ -73,7 +73,7 @@ pub enum Error {
     EncryptionFailed,
     DecryptionFailed,
     WrongKeyLength,
-    InvalidUTF8,
+    InvalidUtf8,
 }
 
 impl std::fmt::Display for Error {
@@ -83,7 +83,7 @@ impl std::fmt::Display for Error {
             Error::Hex(e) => write!(f, "{}", e),
             Error::EncryptionFailed => write!(f, "encryption failed"),
             Error::DecryptionFailed => write!(f, "encryption failed"),
-            Error::InvalidUTF8 => write!(f, "invalid UTF-8"),
+            Error::InvalidUtf8 => write!(f, "invalid UTF-8"),
             Error::WrongKeyLength => write!(f, "expected 32-bytes key"),
         }
     }

src/github.rs

@@ -140,7 +140,7 @@ impl GitHubApi {
                     ids: chunk.iter().map(|id| user_node_id(*id)).collect(),
                 },
             )?;
-            for node in res.nodes.into_iter().filter_map(|n| n) {
+            for node in res.nodes.into_iter().flatten() {
                 result.insert(node.database_id, node.login);
             }
         }

src/permissions.rs

@@ -5,23 +5,23 @@ use std::collections::{HashMap, HashSet};
 
 #[derive(serde_derive::Deserialize, Debug, Clone)]
 #[serde(deny_unknown_fields)]
-pub(crate) struct BorsACL {
+pub(crate) struct BorsAcl {
     #[serde(default)]
     review: bool,
     #[serde(rename = "try", default)]
     try_: bool,
 }
 
-impl Default for BorsACL {
+impl Default for BorsAcl {
     fn default() -> Self {
-        BorsACL {
+        BorsAcl {
             review: false,
             try_: false,
         }
     }
 }
 
-impl BorsACL {
+impl BorsAcl {
     pub(crate) fn review(&self) -> bool {
         self.review
     }
@@ -35,7 +35,7 @@ impl BorsACL {
 #[serde(rename_all = "kebab-case")]
 pub(crate) struct Permissions {
     #[serde(default)]
-    bors: HashMap<String, BorsACL>,
+    bors: HashMap<String, BorsAcl>,
     #[serde(default)]
     crates_io_ops_bot: HashMap<String, bool>,
     #[serde(flatten)]
@@ -53,7 +53,7 @@ impl Default for Permissions {
 }
 
 impl Permissions {
-    pub(crate) fn bors(&self) -> &HashMap<String, BorsACL> {
+    pub(crate) fn bors(&self) -> &HashMap<String, BorsAcl> {
         &self.bors
     }