From d92d2f5932eb84f25e65efd010f3b1621910883e Mon Sep 17 00:00:00 2001
From: Miraty <miraty+git@antopie.org>
Date: Tue, 21 Feb 2023 15:48:27 +0100
Subject: [PATCH] Use cargo fmt

---
 dit/src/main.rs       | 42 ++++++++++++++++++++++++------------------
 libdit/src/lib.rs     | 15 ++++++++++-----
 libstardit/src/lib.rs |  9 +++++----
 rustfmt.toml          |  1 +
 stardit/src/main.rs   |  4 ++--
 5 files changed, 42 insertions(+), 29 deletions(-)
 create mode 100644 rustfmt.toml

diff --git a/dit/src/main.rs b/dit/src/main.rs
index 17aab72..ca750b5 100644
--- a/dit/src/main.rs
+++ b/dit/src/main.rs
@@ -1,24 +1,24 @@
-pub use std::time::{SystemTime,UNIX_EPOCH};
-use libdit::libdit::Dit;
-use std::str::FromStr;
 pub use libdit::libdit::unix_to_dit_string;
+use libdit::libdit::Dit;
 pub use libstardit::libstardit::unix_to_stardit;
+use std::str::FromStr;
+pub use std::time::{SystemTime, UNIX_EPOCH};
 
 fn main() {
-    /*
-	let code: &str = &r"0.12.34";
-    match Dit::from_str(code) {
-        Ok(dit) => {
-            println!(
-                r"Dit: deca: {} decim: {} desec: {}",
-                dit.deca, dit.decim, dit.desec
-            );
-        }
-        Err(_) => {
-            println!("{} is not a valid DIT!", code);
-        }
-    }
-*/
+	/*
+		let code: &str = &r"0.12.34";
+		match Dit::from_str(code) {
+			Ok(dit) => {
+				println!(
+					r"Dit: deca: {} decim: {} desec: {}",
+					dit.deca, dit.decim, dit.desec
+				);
+			}
+			Err(_) => {
+				println!("{} is not a valid DIT!", code);
+			}
+		}
+	*/
 	let current_timestamp = SystemTime::now()
 		.duration_since(UNIX_EPOCH)
 		.unwrap()
@@ -26,5 +26,11 @@ fn main() {
 
 	let stardit = unix_to_stardit(current_timestamp);
 
-	println!("{}\n{}, décade {}, {}", unix_to_dit_string(current_timestamp), stardit.year, stardit.weekade, stardit.day_name);
+	println!(
+		"{}\n{}, décade {}, {}",
+		unix_to_dit_string(current_timestamp),
+		stardit.year,
+		stardit.weekade,
+		stardit.day_name
+	);
 }
diff --git a/libdit/src/lib.rs b/libdit/src/lib.rs
index 202c9f5..44d793d 100644
--- a/libdit/src/lib.rs
+++ b/libdit/src/lib.rs
@@ -5,7 +5,7 @@ pub mod libdit {
 	pub struct Dit {
 		pub deca: u16,
 		pub decim: u16,
-		pub desec: u16
+		pub desec: u16,
 	}
 
 	impl FromStr for Dit {
@@ -15,14 +15,14 @@ pub mod libdit {
 			return Ok(Dit {
 				deca: u16::from_str_radix(&dit[0..1], 10)?,
 				decim: u16::from_str_radix(&dit[2..4], 10)?,
-				desec: u16::from_str_radix(&dit[5..7], 10)?
+				desec: u16::from_str_radix(&dit[5..7], 10)?,
 			});
 		}
 	}
 
 	/// Returns relative progress in the day, between 0 and 1 corresponding to `unix`
 	pub fn unix_to_dit(unix: f64) -> f64 {
-		return (unix - (12.0*3600.0)) % 86400.0 / 86400.0;
+		return (unix - (12.0 * 3600.0)) % 86400.0 / 86400.0;
 	}
 
 	/// Returns a struct containing deca, decim and desec corresponding to `unix`
@@ -31,7 +31,7 @@ pub mod libdit {
 		return Dit {
 			deca: (dit * 10.0 % 10.0) as u16,
 			decim: (dit * 1000.0 % 100.0) as u16,
-			desec: (dit * 100000.0 % 100.0) as u16
+			desec: (dit * 100000.0 % 100.0) as u16,
 		};
 	}
 
@@ -45,6 +45,11 @@ pub mod libdit {
 	/// ```
 	pub fn unix_to_dit_string(unix: f64) -> String {
 		let dit = unix_to_dit_struct(unix);
-		return format!("{}.{}.{}", dit.deca, format!("{:0>2}", dit.decim), format!("{:0>2}", dit.desec));
+		return format!(
+			"{}.{}.{}",
+			dit.deca,
+			format!("{:0>2}", dit.decim),
+			format!("{:0>2}", dit.desec)
+		);
 	}
 }
diff --git a/libstardit/src/lib.rs b/libstardit/src/lib.rs
index 7390289..430535b 100644
--- a/libstardit/src/lib.rs
+++ b/libstardit/src/lib.rs
@@ -1,17 +1,17 @@
 extern crate chrono;
 
 pub mod libstardit {
-	use chrono::{TimeZone, Datelike, LocalResult};
+	use chrono::{Datelike, LocalResult, TimeZone};
 
 	pub struct StarDIT {
 		pub year: u16,
 		pub weekade: u16,
 		pub day_name: String,
-		pub day: u16
+		pub day: u16,
 	}
 
 	pub fn unix_to_stardit(unix: f64) -> StarDIT {
-		let date = match chrono::Utc.timestamp_millis_opt(((unix as i64) - 12*3600) * 1000) {
+		let date = match chrono::Utc.timestamp_millis_opt(((unix as i64) - 12 * 3600) * 1000) {
 			LocalResult::Single(date) => date,
 			_ => panic!("Incorrect timestamp_millis"),
 		};
@@ -31,7 +31,8 @@ pub mod libstardit {
 				8 => "octidi",
 				9 => "nonidi",
 				_ => "?",
-			}.to_string(),
+			}
+			.to_string(),
 			day: day,
 		};
 	}
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..218e203
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1 @@
+hard_tabs = true
diff --git a/stardit/src/main.rs b/stardit/src/main.rs
index 8301576..ec365ea 100644
--- a/stardit/src/main.rs
+++ b/stardit/src/main.rs
@@ -1,5 +1,5 @@
-pub use std::time::{SystemTime,UNIX_EPOCH};
 pub use libstardit::libstardit::unix_to_stardit;
+pub use std::time::{SystemTime, UNIX_EPOCH};
 
 fn main() {
 	let current_timestamp = SystemTime::now()
@@ -52,5 +52,5 @@ fn main() {
 }
 
 fn is_leap_year(year: i32) -> bool {
-	return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)
+	return year % 4 == 0 && (year % 100 != 0 || year % 400 == 0);
 }