From 72b3b33206556ddf47c1122fd87a743aefa1ecac Mon Sep 17 00:00:00 2001
From: _ <>
Date: Fri, 18 Dec 2020 23:41:52 +0000
Subject: [PATCH] :rotating_light: refactor: fix some Clippy lints

---
 .../ptth_server/src/file_server/internal.rs   | 64 +++++++++----------
 crates/ptth_server/src/file_server/metrics.rs |  7 +-
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/crates/ptth_server/src/file_server/internal.rs b/crates/ptth_server/src/file_server/internal.rs
index de6335a..109ccd3 100644
--- a/crates/ptth_server/src/file_server/internal.rs
+++ b/crates/ptth_server/src/file_server/internal.rs
@@ -181,39 +181,39 @@ async fn serve_api (
 {
 	use Response::*;
 	
-	match prefix_match ("/v1/dir/", path) {
-		None => (),
-		Some (path) => {
-			let encoded_path = &path [0..];
-			
-			let path_s = percent_decode (encoded_path.as_bytes ()).decode_utf8 ().map_err (FileServerError::PathNotUtf8)?;
-			let path = Path::new (&*path_s);
-			
-			let full_path = root.join (path);
-			
-			debug! ("full_path = {:?}", full_path);
-			
-			if let Some (hidden_path) = hidden_path {
-				if full_path == hidden_path {
-					return Ok (Forbidden);
-				}
+	// API versioning will be major-only, so I'll keep adding stuff to v1
+	// until I need to deprecate or break something.
+	
+	if let Some (path) = prefix_match ("/v1/dir/", path) {
+		let encoded_path = &path [0..];
+		
+		let path_s = percent_decode (encoded_path.as_bytes ()).decode_utf8 ().map_err (FileServerError::PathNotUtf8)?;
+		let path = Path::new (&*path_s);
+		
+		let full_path = root.join (path);
+		
+		debug! ("full_path = {:?}", full_path);
+		
+		if let Some (hidden_path) = hidden_path {
+			if full_path == hidden_path {
+				return Ok (Forbidden);
 			}
-			
-			return if let Ok (dir) = read_dir (&full_path).await {
-				serve_dir (
-					&path_s,
-					path,
-					dir,
-					full_path,
-					&uri,
-					OutputFormat::Json
-				)
-			}
-			else {
-				Ok (NotFound)
-			};
-		},
-	};
+		}
+		
+		return if let Ok (dir) = read_dir (&full_path).await {
+			serve_dir (
+				&path_s,
+				path,
+				dir,
+				full_path,
+				&uri,
+				OutputFormat::Json
+			)
+		}
+		else {
+			Ok (NotFound)
+		};
+	}
 	
 	Ok (NotFound)
 }
diff --git a/crates/ptth_server/src/file_server/metrics.rs b/crates/ptth_server/src/file_server/metrics.rs
index 19f697c..6c74d3f 100644
--- a/crates/ptth_server/src/file_server/metrics.rs
+++ b/crates/ptth_server/src/file_server/metrics.rs
@@ -17,7 +17,7 @@ pub struct InstanceMetrics {
 	pub machine_id: Option <String>,
 	
 	// Git version that ptth_server was built from (unimplemented)
-	pub _git_version: Option <String>,
+	pub git_version: Option <String>,
 	
 	// User-assigned and human-readable name for this server.
 	// Must be unique within a relay.
@@ -37,7 +37,7 @@ fn get_machine_id () -> Option <String> {
 		io::Read,
 	};
 	
-	let mut buf = vec! [0u8; 1024];
+	let mut buf = vec! [0; 1024];
 	let mut f = File::open ("/etc/machine-id").ok ()?;
 	let bytes_read = f.read (&mut buf).ok ()?;
 	
@@ -50,11 +50,12 @@ fn get_machine_id () -> Option <String> {
 }
 
 impl InstanceMetrics {
+	#[must_use]
 	pub fn new (server_name: String) -> Self
 	{
 		Self {
 			machine_id: get_machine_id (),
-			_git_version: None,
+			git_version: None,
 			server_name,
 			instance_id: ulid::Ulid::new (),
 			startup_utc: Utc::now (),