Skip to content

Commit 2b77a59

Browse files
author
avifenesh
committed
Update dependencies and improve error handling in connection module
Signed-off-by: avifenesh <[email protected]>
1 parent 13de5a3 commit 2b77a59

File tree

4 files changed

+10
-17
lines changed

4 files changed

+10
-17
lines changed

glide-core/redis-rs/redis/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ ryu = "1.0"
2626
itoa = "1.0"
2727

2828
# Strum is a set of macros and traits for working with enums and strings easier in Rust.
29-
strum = "0.26"
30-
strum_macros = "0.26"
29+
strum = "0.27"
30+
strum_macros = "0.27"
3131

3232
# This is a dependency that already exists in url
3333
percent-encoding = "2.1"
@@ -160,13 +160,13 @@ disable-client-setinfo = []
160160
tls = ["tls-native-tls"] # use "tls-native-tls" instead
161161

162162
[dev-dependencies]
163-
rand = "0.8"
163+
rand = "0.9"
164164
socket2 = "0.5"
165165
assert_approx_eq = "1.0"
166166
fnv = "1.0.5"
167167
futures = "0.3"
168168
futures-time = "3"
169-
criterion = "0.4"
169+
criterion = "0.5"
170170
partial-io = { version = "0.5", features = ["tokio", "quickcheck1"] }
171171
quickcheck = "1.0.3"
172172
tokio = { version = "1", features = [
@@ -175,11 +175,11 @@ tokio = { version = "1", features = [
175175
"rt-multi-thread",
176176
"time",
177177
] }
178-
tempfile = "=3.6.0"
178+
tempfile = "3.17"
179179
once_cell = "1"
180180
anyhow = "1"
181181
sscanf = "0.4.1"
182-
serial_test = "^2"
182+
serial_test = "^3"
183183
versions = "6.3"
184184
which = "7.0.1"
185185

glide-core/redis-rs/redis/src/connection.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -908,18 +908,11 @@ pub(crate) fn create_rustls_config(
908908
native_certs
909909
.certs
910910
.iter()
911-
.map(|der| root_store.add(der.to_owned()))
912-
.collect::<Result<(), _>>()?;
911+
.try_for_each(|der| root_store.add(der.to_owned()))?;
913912
} else {
914913
fail!((
915914
ErrorKind::InvalidClientConfig,
916-
"Unable to load native certificates",
917-
native_certs
918-
.errors
919-
.iter()
920-
.map(|e| e.to_string())
921-
.collect::<Vec<_>>()
922-
.join("\n")
915+
"Unable to load native certificates"
923916
));
924917
}
925918

glide-core/redis-rs/rustfmt.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
use_try_shorthand = true
2-
edition = "2018"
2+
edition = "2024"

glide-core/src/glide_paths.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl GlidePaths {
8585

8686
/// Replace the glide_file with a new path.
8787
pub fn set_glide_file_string(&mut self, glide_file: &str) {
88-
self.glide_file = string_to_pathbuf(&glide_file);
88+
self.glide_file = string_to_pathbuf(glide_file);
8989
}
9090
}
9191

0 commit comments

Comments
 (0)