aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/garage/cli/init.rs4
-rw-r--r--src/garage/cli/util.rs2
-rw-r--r--src/garage/tests/k2v/poll.rs7
-rw-r--r--src/garage/tests/s3/website.rs6
4 files changed, 10 insertions, 9 deletions
diff --git a/src/garage/cli/init.rs b/src/garage/cli/init.rs
index 511b53a6..20813f1c 100644
--- a/src/garage/cli/init.rs
+++ b/src/garage/cli/init.rs
@@ -14,11 +14,11 @@ pub fn node_id_command(config_file: PathBuf, quiet: bool) -> Result<(), Error> {
garage_rpc::system::read_node_id(&config.metadata_dir).err_context(READ_KEY_ERROR)?;
let idstr = if let Some(addr) = config.rpc_public_addr {
- let idstr = format!("{}@{}", hex::encode(&node_id), addr);
+ let idstr = format!("{}@{}", hex::encode(node_id), addr);
println!("{}", idstr);
idstr
} else {
- let idstr = hex::encode(&node_id);
+ let idstr = hex::encode(node_id);
println!("{}", idstr);
if !quiet {
diff --git a/src/garage/cli/util.rs b/src/garage/cli/util.rs
index 230ce3de..2c6be2f4 100644
--- a/src/garage/cli/util.rs
+++ b/src/garage/cli/util.rs
@@ -229,7 +229,7 @@ pub fn find_matching_node(
) -> Result<Uuid, Error> {
let mut candidates = vec![];
for c in cand {
- if hex::encode(&c).starts_with(&pattern) && !candidates.contains(&c) {
+ if hex::encode(c).starts_with(pattern) && !candidates.contains(&c) {
candidates.push(c);
}
}
diff --git a/src/garage/tests/k2v/poll.rs b/src/garage/tests/k2v/poll.rs
index f54cc5d4..5280255a 100644
--- a/src/garage/tests/k2v/poll.rs
+++ b/src/garage/tests/k2v/poll.rs
@@ -1,3 +1,4 @@
+use base64::prelude::*;
use hyper::{Method, StatusCode};
use std::time::Duration;
@@ -160,7 +161,7 @@ async fn test_poll_range() {
json!(
{
"items": [
- {"sk": "test1", "ct": ct, "v": [base64::encode(b"Initial value")]},
+ {"sk": "test1", "ct": ct, "v": [BASE64_STANDARD.encode(b"Initial value")]},
],
"seenMarker": seen_marker,
}
@@ -212,7 +213,7 @@ async fn test_poll_range() {
assert_json_eq!(&json_res["items"][0]["sk"], json!("test1"));
assert_json_eq!(
&json_res["items"][0]["v"],
- json!([base64::encode(b"New value")])
+ json!([BASE64_STANDARD.encode(b"New value")])
);
// Now we will add a value on a different key
@@ -259,6 +260,6 @@ async fn test_poll_range() {
assert_json_eq!(&json_res["items"][0]["sk"], json!("test2"));
assert_json_eq!(
&json_res["items"][0]["v"],
- json!([base64::encode(b"Other value")])
+ json!([BASE64_STANDARD.encode(b"Other value")])
);
}
diff --git a/src/garage/tests/s3/website.rs b/src/garage/tests/s3/website.rs
index f57e31ee..4e136e1b 100644
--- a/src/garage/tests/s3/website.rs
+++ b/src/garage/tests/s3/website.rs
@@ -57,7 +57,7 @@ async fn test_website() {
Request::builder()
.method("GET")
.uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port))
- .header("domain", format!("{}", BCKT_NAME))
+ .header("domain", BCKT_NAME.to_string())
.body(Body::empty())
.unwrap()
};
@@ -92,7 +92,7 @@ async fn test_website() {
Request::builder()
.method("GET")
.uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port))
- .header("domain", format!("{}", BCKT_NAME))
+ .header("domain", BCKT_NAME.to_string())
.body(Body::empty())
.unwrap()
};
@@ -121,7 +121,7 @@ async fn test_website() {
Request::builder()
.method("GET")
.uri(format!("http://127.0.0.1:{}/check", ctx.garage.admin_port))
- .header("domain", format!("{}", BCKT_NAME))
+ .header("domain", BCKT_NAME.to_string())
.body(Body::empty())
.unwrap()
};