diff options
| author | Alex <alex@adnab.me> | 2023-01-26 21:10:21 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2023-01-26 21:10:21 +0000 |
| commit | f2c256cac4e599335d592dd580011cf15f278a51 (patch) | |
| tree | 8a7e90cf4bcf40ef7513e9ffaa636a012ebcc4a9 /src/rpc | |
| parent | a08e01f17a9e4bb80880e28a4a28b2d88a9aec83 (diff) | |
| parent | d6af95d20520eec64e5e4c0c873c6e3a8ac1509d (diff) | |
| download | garage-f2c256cac4e599335d592dd580011cf15f278a51.tar.gz garage-f2c256cac4e599335d592dd580011cf15f278a51.zip | |
Merge pull request 'Many clippy lints fixed' (#488) from k2v-watch-range-2 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/488
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/consul.rs | 2 | ||||
| -rw-r--r-- | src/rpc/system.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rpc/consul.rs b/src/rpc/consul.rs index b1772a1a..f85f789c 100644 --- a/src/rpc/consul.rs +++ b/src/rpc/consul.rs @@ -113,7 +113,7 @@ impl ConsulDiscovery { let pubkey = ent .node_meta .get("pubkey") - .and_then(|k| hex::decode(&k).ok()) + .and_then(|k| hex::decode(k).ok()) .and_then(|k| NodeID::from_slice(&k[..])); if let (Some(ip), Some(pubkey)) = (ip, pubkey) { ret.push((pubkey, SocketAddr::new(ip, ent.service_port))); diff --git a/src/rpc/system.rs b/src/rpc/system.rs index e0ced8cc..b42e49fc 100644 --- a/src/rpc/system.rs +++ b/src/rpc/system.rs @@ -215,7 +215,7 @@ pub fn gen_node_key(metadata_dir: &Path) -> Result<NodeKey, Error> { } else { if !metadata_dir.exists() { info!("Metadata directory does not exist, creating it."); - std::fs::create_dir(&metadata_dir)?; + std::fs::create_dir(metadata_dir)?; } info!("Generating new node key pair."); @@ -419,7 +419,7 @@ impl System { .get(&n.id.into()) .cloned() .map(|(_, st)| st) - .unwrap_or(NodeStatus::unknown()), + .unwrap_or_else(NodeStatus::unknown), }) .collect::<Vec<_>>(); known_nodes |