Run clippy

Author: sfackler

.circleci/config.yml

@@ -28,8 +28,9 @@ jobs:
       - image: sfackler/rust-postgres-test:5
     steps:
       - checkout
-      - run: rustup component add rustfmt
+      - run: rustup component add rustfmt clippy
       - run: cargo fmt --all -- --check
+      - run: cargo clippy --all
       - *RESTORE_REGISTRY
       - run: cargo generate-lockfile
       - *SAVE_REGISTRY

codegen/src/main.rs

@@ -1,3 +1,5 @@
+#![warn(clippy::all)]
+
 extern crate linked_hash_map;
 extern crate marksman_escape;
 extern crate phf_codegen;

codegen/src/sqlstate.rs

@@ -4,7 +4,7 @@ use std::fs::File;
 use std::io::{BufWriter, Write};
 use std::path::Path;
 
-const ERRCODES_TXT: &'static str = include_str!("errcodes.txt");
+const ERRCODES_TXT: &str = include_str!("errcodes.txt");
 
 pub fn build(path: &Path) {
     let mut file = BufWriter::new(File::create(path.join("error/sqlstate.rs")).unwrap());
@@ -20,7 +20,7 @@ fn parse_codes() -> LinkedHashMap<String, Vec<String>> {
     let mut codes = LinkedHashMap::new();
 
     for line in ERRCODES_TXT.lines() {
-        if line.starts_with("#") || line.starts_with("Section") || line.trim().is_empty() {
+        if line.starts_with('#') || line.starts_with("Section") || line.trim().is_empty() {
             continue;
         }
 
@@ -39,7 +39,6 @@ fn make_type(file: &mut BufWriter<File>) {
     write!(
         file,
         "// Autogenerated file - DO NOT EDIT
-use phf;
 use std::borrow::Cow;
 
 /// A SQLSTATE error code
@@ -96,5 +95,5 @@ static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = "
         builder.entry(&**code, &format!("SqlState::{}", &names[0]));
     }
     builder.build(file).unwrap();
-    write!(file, ";\n").unwrap();
+    writeln!(file, ";").unwrap();
 }

codegen/src/type_gen.rs

@@ -7,8 +7,8 @@ use std::path::Path;
 
 use crate::snake_to_camel;
 
-const PG_TYPE_H: &'static str = include_str!("pg_type.h");
-const PG_RANGE_H: &'static str = include_str!("pg_range.h");
+const PG_TYPE_H: &str = include_str!("pg_type.h");
+const PG_RANGE_H: &str = include_str!("pg_range.h");
 
 struct Type {
     name: &'static str,
@@ -122,7 +122,7 @@ fn make_header(w: &mut BufWriter<File>) {
         "// Autogenerated file - DO NOT EDIT
 use std::sync::Arc;
 
-use types::{{Type, Oid, Kind}};
+use crate::types::{{Type, Oid, Kind}};
 
 #[derive(PartialEq, Eq, Debug)]
 pub struct Other {{
@@ -231,8 +231,7 @@ fn make_impl(w: &mut BufWriter<File>, types: &BTreeMap<u32, Type>) {
         write!(
             w,
             "            Inner::{} => {{
-                const V: &'static Kind = &Kind::{};
-                V
+                &Kind::{}
             }}
 ",
             type_.variant, kind

postgres-protocol/src/authentication/sasl.rs

@@ -14,9 +14,9 @@ use std::str;
 const NONCE_LENGTH: usize = 24;
 
 /// The identifier of the SCRAM-SHA-256 SASL authentication mechanism.
-pub const SCRAM_SHA_256: &'static str = "SCRAM-SHA-256";
+pub const SCRAM_SHA_256: &str = "SCRAM-SHA-256";
 /// The identifier of the SCRAM-SHA-256-PLUS SASL authentication mechanism.
-pub const SCRAM_SHA_256_PLUS: &'static str = "SCRAM-SHA-256-PLUS";
+pub const SCRAM_SHA_256_PLUS: &str = "SCRAM-SHA-256-PLUS";
 
 // since postgres passwords are not required to exclude saslprep-prohibited
 // characters or even be valid UTF8, we run saslprep if possible and otherwise
@@ -153,7 +153,7 @@ impl ScramSha256 {
             state: State::Update {
                 nonce,
                 password: normalize(password),
-                channel_binding: channel_binding,
+                channel_binding,
             },
         }
     }
@@ -228,8 +228,8 @@ impl ScramSha256 {
         write!(&mut self.message, ",p={}", base64::encode(&*client_proof)).unwrap();
 
         self.state = State::Finish {
-            salted_password: salted_password,
-            auth_message: auth_message,
+            salted_password,
+            auth_message,
         };
         Ok(())
     }
@@ -288,7 +288,7 @@ struct Parser<'a> {
 impl<'a> Parser<'a> {
     fn new(s: &'a str) -> Parser<'a> {
         Parser {
-            s: s,
+            s,
             it: s.char_indices().peekable(),
         }
     }
@@ -390,9 +390,9 @@ impl<'a> Parser<'a> {
         self.eof()?;
 
         Ok(ServerFirstMessage {
-            nonce: nonce,
-            salt: salt,
-            iteration_count: iteration_count,
+            nonce,
+            salt,
+            iteration_count,
         })
     }
 

postgres-protocol/src/lib.rs

@@ -10,7 +10,7 @@
 //! This library assumes that the `client_encoding` backend parameter has been
 //! set to `UTF8`. It will most likely not behave properly if that is not the case.
 #![doc(html_root_url = "https://docs.rs/postgres-protocol/0.3")]
-#![warn(missing_docs, rust_2018_idioms)]
+#![warn(missing_docs, rust_2018_idioms, clippy::all)]
 
 use byteorder::{BigEndian, ByteOrder};
 use std::io;

postgres-protocol/src/message/backend.rs

@@ -88,65 +88,62 @@ impl Message {
                 let channel = buf.read_cstr()?;
                 let message = buf.read_cstr()?;
                 Message::NotificationResponse(NotificationResponseBody {
-                    process_id: process_id,
-                    channel: channel,
-                    message: message,
+                    process_id,
+                    channel,
+                    message,
                 })
             }
             b'c' => Message::CopyDone,
             b'C' => {
                 let tag = buf.read_cstr()?;
-                Message::CommandComplete(CommandCompleteBody { tag: tag })
+                Message::CommandComplete(CommandCompleteBody { tag })
             }
             b'd' => {
                 let storage = buf.read_all();
-                Message::CopyData(CopyDataBody { storage: storage })
+                Message::CopyData(CopyDataBody { storage })
             }
             b'D' => {
                 let len = buf.read_u16::<BigEndian>()?;
                 let storage = buf.read_all();
-                Message::DataRow(DataRowBody {
-                    storage: storage,
-                    len: len,
-                })
+                Message::DataRow(DataRowBody { storage, len })
             }
             b'E' => {
                 let storage = buf.read_all();
-                Message::ErrorResponse(ErrorResponseBody { storage: storage })
+                Message::ErrorResponse(ErrorResponseBody { storage })
             }
             b'G' => {
                 let format = buf.read_u8()?;
                 let len = buf.read_u16::<BigEndian>()?;
                 let storage = buf.read_all();
                 Message::CopyInResponse(CopyInResponseBody {
-                    format: format,
-                    len: len,
-                    storage: storage,
+                    format,
+                    len,
+                    storage,
                 })
             }
             b'H' => {
                 let format = buf.read_u8()?;
                 let len = buf.read_u16::<BigEndian>()?;
                 let storage = buf.read_all();
                 Message::CopyOutResponse(CopyOutResponseBody {
-                    format: format,
-                    len: len,
-                    storage: storage,
+                    format,
+                    len,
+                    storage,
                 })
             }
             b'I' => Message::EmptyQueryResponse,
             b'K' => {
                 let process_id = buf.read_i32::<BigEndian>()?;
                 let secret_key = buf.read_i32::<BigEndian>()?;
                 Message::BackendKeyData(BackendKeyDataBody {
-                    process_id: process_id,
-                    secret_key: secret_key,
+                    process_id,
+                    secret_key,
                 })
             }
             b'n' => Message::NoData,
             b'N' => {
                 let storage = buf.read_all();
-                Message::NoticeResponse(NoticeResponseBody { storage: storage })
+                Message::NoticeResponse(NoticeResponseBody { storage })
             }
             b'R' => match buf.read_i32::<BigEndian>()? {
                 0 => Message::AuthenticationOk,
@@ -155,7 +152,7 @@ impl Message {
                 5 => {
                     let mut salt = [0; 4];
                     buf.read_exact(&mut salt)?;
-                    Message::AuthenticationMd5Password(AuthenticationMd5PasswordBody { salt: salt })
+                    Message::AuthenticationMd5Password(AuthenticationMd5PasswordBody { salt })
                 }
                 6 => Message::AuthenticationScmCredential,
                 7 => Message::AuthenticationGss,
@@ -187,30 +184,21 @@ impl Message {
             b'S' => {
                 let name = buf.read_cstr()?;
                 let value = buf.read_cstr()?;
-                Message::ParameterStatus(ParameterStatusBody {
-                    name: name,
-                    value: value,
-                })
+                Message::ParameterStatus(ParameterStatusBody { name, value })
             }
             b't' => {
                 let len = buf.read_u16::<BigEndian>()?;
                 let storage = buf.read_all();
-                Message::ParameterDescription(ParameterDescriptionBody {
-                    storage: storage,
-                    len: len,
-                })
+                Message::ParameterDescription(ParameterDescriptionBody { storage, len })
             }
             b'T' => {
                 let len = buf.read_u16::<BigEndian>()?;
                 let storage = buf.read_all();
-                Message::RowDescription(RowDescriptionBody {
-                    storage: storage,
-                    len: len,
-                })
+                Message::RowDescription(RowDescriptionBody { storage, len })
             }
             b'Z' => {
                 let status = buf.read_u8()?;
-                Message::ReadyForQuery(ReadyForQueryBody { status: status })
+                Message::ReadyForQuery(ReadyForQueryBody { status })
             }
             tag => {
                 return Err(io::Error::new(
@@ -305,7 +293,7 @@ pub struct AuthenticationSaslBody(Bytes);
 
 impl AuthenticationSaslBody {
     #[inline]
-    pub fn mechanisms<'a>(&'a self) -> SaslMechanisms<'a> {
+    pub fn mechanisms(&self) -> SaslMechanisms<'_> {
         SaslMechanisms(&self.0)
     }
 }
@@ -410,7 +398,7 @@ impl CopyInResponseBody {
     }
 
     #[inline]
-    pub fn column_formats<'a>(&'a self) -> ColumnFormats<'a> {
+    pub fn column_formats(&self) -> ColumnFormats<'_> {
         ColumnFormats {
             remaining: self.len,
             buf: &self.storage,
@@ -464,7 +452,7 @@ impl CopyOutResponseBody {
     }
 
     #[inline]
-    pub fn column_formats<'a>(&'a self) -> ColumnFormats<'a> {
+    pub fn column_formats(&self) -> ColumnFormats<'_> {
         ColumnFormats {
             remaining: self.len,
             buf: &self.storage,
@@ -479,7 +467,7 @@ pub struct DataRowBody {
 
 impl DataRowBody {
     #[inline]
-    pub fn ranges<'a>(&'a self) -> DataRowRanges<'a> {
+    pub fn ranges(&self) -> DataRowRanges<'_> {
         DataRowRanges {
             buf: &self.storage,
             len: self.storage.len(),
@@ -547,7 +535,7 @@ pub struct ErrorResponseBody {
 
 impl ErrorResponseBody {
     #[inline]
-    pub fn fields<'a>(&'a self) -> ErrorFields<'a> {
+    pub fn fields(&self) -> ErrorFields<'_> {
         ErrorFields { buf: &self.storage }
     }
 }
@@ -578,10 +566,7 @@ impl<'a> FallibleIterator for ErrorFields<'a> {
         let value = get_str(&self.buf[..value_end])?;
         self.buf = &self.buf[value_end + 1..];
 
-        Ok(Some(ErrorField {
-            type_: type_,
-            value: value,
-        }))
+        Ok(Some(ErrorField { type_, value }))
     }
 }
 
@@ -608,7 +593,7 @@ pub struct NoticeResponseBody {
 
 impl NoticeResponseBody {
     #[inline]
-    pub fn fields<'a>(&'a self) -> ErrorFields<'a> {
+    pub fn fields(&self) -> ErrorFields<'_> {
         ErrorFields { buf: &self.storage }
     }
 }
@@ -643,7 +628,7 @@ pub struct ParameterDescriptionBody {
 
 impl ParameterDescriptionBody {
     #[inline]
-    pub fn parameters<'a>(&'a self) -> Parameters<'a> {
+    pub fn parameters(&self) -> Parameters<'_> {
         Parameters {
             buf: &self.storage,
             remaining: self.len,
@@ -719,7 +704,7 @@ pub struct RowDescriptionBody {
 
 impl RowDescriptionBody {
     #[inline]
-    pub fn fields<'a>(&'a self) -> Fields<'a> {
+    pub fn fields(&self) -> Fields<'_> {
         Fields {
             buf: &self.storage,
             remaining: self.len,
@@ -761,13 +746,13 @@ impl<'a> FallibleIterator for Fields<'a> {
         let format = self.buf.read_i16::<BigEndian>()?;
 
         Ok(Some(Field {
-            name: name,
-            table_oid: table_oid,
-            column_id: column_id,
-            type_oid: type_oid,
-            type_size: type_size,
-            type_modifier: type_modifier,
-            format: format,
+            name,
+            table_oid,
+            column_id,
+            type_oid,
+            type_size,
+            type_modifier,
+            format,
         }))
     }
 }