Merge pull request sfackler#749 from sfackler/actions

Switch CI to github actions

Author: sfackler

.circleci/config.yml

@@ -0,0 +1,83 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+env:
+  RUSTFLAGS: -Dwarnings
+  RUST_BACKTRACE: 1
+
+jobs:
+  rustfmt:
+    name: rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: sfackler/actions/rustup@master
+      - uses: sfackler/actions/rustfmt@master
+  
+  clippy:
+    name: clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: sfackler/actions/rustup@master
+      - run: echo "::set-output name=version::$(rustc --version)"
+        id: rust-version
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry/index
+          key: index-${{ runner.os }}-${{ github.run_number }}
+          restore-keys: |
+            index-${{ runner.os }}-
+      - run: cargo generate-lockfile
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry/cache
+          key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
+      - run: cargo fetch
+      - uses: actions/cache@v1
+        with:
+          path: target
+          key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y
+      - run: cargo clippy --all --all-targets
+
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: sfackler/rust-postgres-test:6
+        ports:
+          - 5433:5433
+    steps:
+      - uses: actions/checkout@v2
+      - uses: sfackler/actions/rustup@master
+        with:
+          version: 1.45.0
+      - run: echo "::set-output name=version::$(rustc --version)"
+        id: rust-version
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry/index
+          key: index-${{ runner.os }}-${{ github.run_number }}
+          restore-keys: |
+            index-${{ runner.os }}-
+      - run: cargo generate-lockfile
+      - uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry/cache
+          key: registry-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
+      - run: cargo fetch
+      - uses: actions/cache@v1
+        with:
+          path: target
+          key: test-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y
+      - run: cargo test --all
+      - run: cargo test --manifest-path tokio-postgres/Cargo.toml --no-default-features
+      - run: cargo test --manifest-path tokio-postgres/Cargo.toml --all-features

.github/workflows/ci.yml

@@ -1,5 +1,4 @@
 # Rust-Postgres
-[![CircleCI](https://circleci.com/gh/sfackler/rust-postgres.svg?style=shield)](https://circleci.com/gh/sfackler/rust-postgres)
 
 PostgreSQL support for Rust.
 

README.md

@@ -231,9 +231,9 @@ fn write_pascal_string(s: &str, buf: &mut BytesMut) -> Result<(), StdBox<dyn Err
 
 /// Deserializes an `HSTORE` value.
 #[inline]
-pub fn hstore_from_sql<'a>(
-    mut buf: &'a [u8],
-) -> Result<HstoreEntries<'a>, StdBox<dyn Error + Sync + Send>> {
+pub fn hstore_from_sql(
+    mut buf: &[u8],
+) -> Result<HstoreEntries<'_>, StdBox<dyn Error + Sync + Send>> {
     let count = buf.read_i32::<BigEndian>()?;
     if count < 0 {
         return Err("invalid entry count".into());
@@ -319,9 +319,7 @@ where
 
 /// Deserializes a `VARBIT` or `BIT` value.
 #[inline]
-pub fn varbit_from_sql<'a>(
-    mut buf: &'a [u8],
-) -> Result<Varbit<'a>, StdBox<dyn Error + Sync + Send>> {
+pub fn varbit_from_sql(mut buf: &[u8]) -> Result<Varbit<'_>, StdBox<dyn Error + Sync + Send>> {
     let len = buf.read_i32::<BigEndian>()?;
     if len < 0 {
         return Err("invalid varbit length: varbit < 0".into());
@@ -508,7 +506,7 @@ where
 
 /// Deserializes an array value.
 #[inline]
-pub fn array_from_sql<'a>(mut buf: &'a [u8]) -> Result<Array<'a>, StdBox<dyn Error + Sync + Send>> {
+pub fn array_from_sql(mut buf: &[u8]) -> Result<Array<'_>, StdBox<dyn Error + Sync + Send>> {
     let dimensions = buf.read_i32::<BigEndian>()?;
     if dimensions < 0 {
         return Err("invalid dimension count".into());
@@ -738,7 +736,7 @@ pub enum RangeBound<T> {
 
 /// Deserializes a range value.
 #[inline]
-pub fn range_from_sql<'a>(mut buf: &'a [u8]) -> Result<Range<'a>, StdBox<dyn Error + Sync + Send>> {
+pub fn range_from_sql(mut buf: &[u8]) -> Result<Range<'_>, StdBox<dyn Error + Sync + Send>> {
     let tag = buf.read_u8()?;
 
     if tag == RANGE_EMPTY {
@@ -911,7 +909,7 @@ where
 
 /// Deserializes a Postgres path.
 #[inline]
-pub fn path_from_sql<'a>(mut buf: &'a [u8]) -> Result<Path<'a>, StdBox<dyn Error + Sync + Send>> {
+pub fn path_from_sql(mut buf: &[u8]) -> Result<Path<'_>, StdBox<dyn Error + Sync + Send>> {
     let closed = buf.read_u8()? != 0;
     let points = buf.read_i32::<BigEndian>()?;
 

postgres-protocol/src/types/mod.rs

@@ -760,8 +760,8 @@ impl<'a> UrlParser<'a> {
 
     fn remove_url_prefix(s: &str) -> Option<&str> {
         for prefix in &["postgres://", "postgresql://"] {
-            if s.starts_with(prefix) {
-                return Some(&s[prefix.len()..]);
+            if let Some(stripped) = s.strip_prefix(prefix) {
+                return Some(stripped);
             }
         }
 
@@ -825,8 +825,8 @@ impl<'a> UrlParser<'a> {
 
                 let host = &chunk[1..idx];
                 let remaining = &chunk[idx + 1..];
-                let port = if remaining.starts_with(':') {
-                    Some(&remaining[1..])
+                let port = if let Some(port) = remaining.strip_prefix(':') {
+                    Some(port)
                 } else if remaining.is_empty() {
                     None
                 } else {

tokio-postgres/src/config.rs

@@ -200,9 +200,10 @@ where
                 return Ok(false);
             }
 
-            if let Poll::Pending = Pin::new(&mut self.stream)
+            if Pin::new(&mut self.stream)
                 .poll_ready(cx)
                 .map_err(Error::io)?
+                .is_pending()
             {
                 trace!("poll_write: waiting on socket");
                 return Ok(false);

tokio-postgres/src/connection.rs

@@ -483,11 +483,7 @@ async fn domain() {
         }
 
         fn accepts(ty: &Type) -> bool {
-            ty.name() == "session_id"
-                && match *ty.kind() {
-                    Kind::Domain(_) => true,
-                    _ => false,
-                }
+            ty.name() == "session_id" && matches!(ty.kind(), Kind::Domain(_))
         }
 
         to_sql_checked!();