6.3.1 (#162)

* chore: move pretty-env-logger to dev-deps and bump version
* chore: bump versions
* chore: update minimum required tokio versions
* chore: update rustfmt.toml
* chore: update ci rust version to 1.72.0, update changelog

---------

Co-authored-by: Troy Benson <troybensonsa@gmail.com>
Co-authored-by: Tom Parker-Shemilt <palfrey@tevp.net>
Co-authored-by: xxai.art <xxai.art@gmail.com>

.circleci/Dockerfile.sentinel

@@ -6,7 +6,7 @@
 
 # note: the top level target directory must be removed prior to running this
 
-FROM cimg/rust:1.62.0
+FROM cimg/rust:1.72.0
 USER circleci
 
 ARG REDIS_VERSION

.circleci/config.yml

@@ -178,7 +178,7 @@ jobs:
       - test_sentinel
   test-docs:
     docker:
-      - image: cimg/rust:1.68.0
+      - image: cimg/rust:1.72.0
     environment:
       CARGO_NET_GIT_FETCH_WITH_CLI: true
     steps:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.3.1
+
+* Update various dependencies
+* Move `pretty-env-logger` to `dev-dependencies`
+* Update rustfmt.toml
+
 ## 6.3.0
 
 * Fix cluster replica discovery with Elasticache

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fred"
-version = "6.3.0"
+version = "6.3.1"
 authors = ["Alec Embke <aembke@gmail.com>"]
 edition = "2021"
 description = "An async Redis client built on Tokio."
@@ -36,8 +36,8 @@ rustdoc-args = ["--cfg", "docsrs"]
 [dependencies]
 arcstr = "1.1"
 arc-swap = "1.5"
-tokio = { version = "1", features = ["net", "sync", "rt", "rt-multi-thread", "macros"] }
-tokio-util = { version = "0.7", features = ["codec"] }
+tokio = { version = "1.19.0", features = ["net", "sync", "rt", "rt-multi-thread", "macros"] }
+tokio-util = { version = "0.7.1", features = ["codec"] }
 cfg-if = "1.0.0"
 bytes = "1.1"
 bytes-utils = "0.1"
@@ -46,10 +46,9 @@ parking_lot = "0.12"
 lazy_static = "1.4"
 redis-protocol = { version = "4.1", features = ["decode-mut"] }
 log = "0.4"
-pretty_env_logger = "0.4"
 float-cmp = "0.9"
 url = "2.3"
-tokio-stream = "0.1"
+tokio-stream = "0.1.1"
 sha-1 = "0.10"
 rand = "0.8"
 async-trait = "0.1"
@@ -62,15 +61,16 @@ tracing-futures = { version = "0.2", optional = true }
 nom = { version = "7.1", optional = true }
 serde_json = { version = "1", optional = true }
 tokio-rustls = { version = "0.24", optional = true }
-webpki = { package = "rustls-webpki", version = "0.100", features = ["alloc", "std"], optional = true }
+webpki = { package = "rustls-webpki", version = "0.101", features = ["alloc", "std"], optional = true }
 rustls-native-certs = { version = "0.6", optional = true }
-trust-dns-resolver = { version =  "0.22", optional = true }
+trust-dns-resolver = { version = "0.23", optional = true }
 
 [dev-dependencies]
-prometheus = "0.12"
-base64 = "0.13"
+prometheus = "0.13"
+base64 = "0.21"
 subprocess = "0.2.7"
 serde = { version = "1.0", features = ["derive"] }
+pretty_env_logger = "0.5"
 
 [lib]
 doc = true
@@ -129,4 +129,4 @@ replicas = []
 client-tracking = []
 # Testing Features
 debug-ids = []
-sentinel-tests = []
+sentinel-tests = []

rustfmt.toml

@@ -1,4 +1,4 @@
-edition = "2018"
+edition = "2021"
 binop_separator = "Front"
 blank_lines_upper_bound = 1
 brace_style = "SameLineWhere"
@@ -10,7 +10,7 @@ empty_item_single_line = true
 error_on_line_overflow = false
 enum_discrim_align_threshold = 0
 error_on_unformatted = false
-fn_args_layout = "Tall"
+fn_params_layout = "Tall"
 fn_single_line = false
 force_explicit_abi = true
 force_multiline_blocks = false
@@ -28,7 +28,7 @@ match_arm_blocks = true
 match_block_trailing_comma = true
 max_width = 118
 merge_derives = true
-merge_imports = true
+imports_granularity="Crate"
 newline_style = "Auto"
 normalize_comments = true
 normalize_doc_attributes = true

tests/docker/runners/images/base.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.69.0-slim-buster
+FROM rust:1.72.0-slim-buster
 
 WORKDIR /project
 

tests/docker/runners/images/ci.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.69.0-slim-buster
+FROM rust:1.72.0-slim-buster
 
 WORKDIR /project
 # circleci doesn't mount volumes with a remote docker engine so we have to copy everything

tests/docker/runners/images/debug.dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.69.0-slim-buster
+FROM rust:1.72.0-slim-buster
 
 WORKDIR /project