Cleanup

1 files changed, 46 insertions, 46 deletions

diff --git a/src/util.rs b/src/util.rs
index 1ed9a7a..59ed2ea 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -11,7 +11,7 @@ pub fn adjust_times_add(mut y: i64, mut mo: i64, mut d: i64, mut h: i64, mut mi:
             $next:ident
         } => {
             $next += ($base - ($base % $border)) / $border;
-            $base = $base % $border;
+            $base %= $border;
         }
     }
 
@@ -102,67 +102,67 @@ fn test_is_leap_year() {
 
 #[test]
 fn test_get_num_of_days_in_month() {
-    assert_eq!(31, get_num_of_days_in_month(2000, 01));
-    assert_eq!(29, get_num_of_days_in_month(2000, 02));
-    assert_eq!(31, get_num_of_days_in_month(2000, 03));
-    assert_eq!(30, get_num_of_days_in_month(2000, 04));
-    assert_eq!(31, get_num_of_days_in_month(2000, 05));
-    assert_eq!(30, get_num_of_days_in_month(2000, 06));
-    assert_eq!(31, get_num_of_days_in_month(2000, 07));
-    assert_eq!(31, get_num_of_days_in_month(2000, 08));
-    assert_eq!(30, get_num_of_days_in_month(2000, 09));
+    assert_eq!(31, get_num_of_days_in_month(2000, 1));
+    assert_eq!(29, get_num_of_days_in_month(2000, 2));
+    assert_eq!(31, get_num_of_days_in_month(2000, 3));
+    assert_eq!(30, get_num_of_days_in_month(2000, 4));
+    assert_eq!(31, get_num_of_days_in_month(2000, 5));
+    assert_eq!(30, get_num_of_days_in_month(2000, 6));
+    assert_eq!(31, get_num_of_days_in_month(2000, 7));
+    assert_eq!(31, get_num_of_days_in_month(2000, 8));
+    assert_eq!(30, get_num_of_days_in_month(2000, 9));
     assert_eq!(31, get_num_of_days_in_month(2000, 10));
     assert_eq!(30, get_num_of_days_in_month(2000, 11));
     assert_eq!(31, get_num_of_days_in_month(2000, 12));
 
-    assert_eq!(31, get_num_of_days_in_month(2001, 01));
-    assert_eq!(28, get_num_of_days_in_month(2001, 02));
-    assert_eq!(31, get_num_of_days_in_month(2001, 03));
-    assert_eq!(30, get_num_of_days_in_month(2001, 04));
-    assert_eq!(31, get_num_of_days_in_month(2001, 05));
-    assert_eq!(30, get_num_of_days_in_month(2001, 06));
-    assert_eq!(31, get_num_of_days_in_month(2001, 07));
-    assert_eq!(31, get_num_of_days_in_month(2001, 08));
-    assert_eq!(30, get_num_of_days_in_month(2001, 09));
+    assert_eq!(31, get_num_of_days_in_month(2001, 1));
+    assert_eq!(28, get_num_of_days_in_month(2001, 2));
+    assert_eq!(31, get_num_of_days_in_month(2001, 3));
+    assert_eq!(30, get_num_of_days_in_month(2001, 4));
+    assert_eq!(31, get_num_of_days_in_month(2001, 5));
+    assert_eq!(30, get_num_of_days_in_month(2001, 6));
+    assert_eq!(31, get_num_of_days_in_month(2001, 7));
+    assert_eq!(31, get_num_of_days_in_month(2001, 8));
+    assert_eq!(30, get_num_of_days_in_month(2001, 9));
     assert_eq!(31, get_num_of_days_in_month(2001, 10));
     assert_eq!(30, get_num_of_days_in_month(2001, 11));
     assert_eq!(31, get_num_of_days_in_month(2001, 12));
 
-    assert_eq!(31, get_num_of_days_in_month(2002, 01));
-    assert_eq!(28, get_num_of_days_in_month(2002, 02));
-    assert_eq!(31, get_num_of_days_in_month(2002, 03));
-    assert_eq!(30, get_num_of_days_in_month(2002, 04));
-    assert_eq!(31, get_num_of_days_in_month(2002, 05));
-    assert_eq!(30, get_num_of_days_in_month(2002, 06));
-    assert_eq!(31, get_num_of_days_in_month(2002, 07));
-    assert_eq!(31, get_num_of_days_in_month(2002, 08));
-    assert_eq!(30, get_num_of_days_in_month(2002, 09));
+    assert_eq!(31, get_num_of_days_in_month(2002, 1));
+    assert_eq!(28, get_num_of_days_in_month(2002, 2));
+    assert_eq!(31, get_num_of_days_in_month(2002, 3));
+    assert_eq!(30, get_num_of_days_in_month(2002, 4));
+    assert_eq!(31, get_num_of_days_in_month(2002, 5));
+    assert_eq!(30, get_num_of_days_in_month(2002, 6));
+    assert_eq!(31, get_num_of_days_in_month(2002, 7));
+    assert_eq!(31, get_num_of_days_in_month(2002, 8));
+    assert_eq!(30, get_num_of_days_in_month(2002, 9));
     assert_eq!(31, get_num_of_days_in_month(2002, 10));
     assert_eq!(30, get_num_of_days_in_month(2002, 11));
     assert_eq!(31, get_num_of_days_in_month(2002, 12));
 
-    assert_eq!(31, get_num_of_days_in_month(2003, 01));
-    assert_eq!(28, get_num_of_days_in_month(2003, 02));
-    assert_eq!(31, get_num_of_days_in_month(2003, 03));
-    assert_eq!(30, get_num_of_days_in_month(2003, 04));
-    assert_eq!(31, get_num_of_days_in_month(2003, 05));
-    assert_eq!(30, get_num_of_days_in_month(2003, 06));
-    assert_eq!(31, get_num_of_days_in_month(2003, 07));
-    assert_eq!(31, get_num_of_days_in_month(2003, 08));
-    assert_eq!(30, get_num_of_days_in_month(2003, 09));
+    assert_eq!(31, get_num_of_days_in_month(2003, 1));
+    assert_eq!(28, get_num_of_days_in_month(2003, 2));
+    assert_eq!(31, get_num_of_days_in_month(2003, 3));
+    assert_eq!(30, get_num_of_days_in_month(2003, 4));
+    assert_eq!(31, get_num_of_days_in_month(2003, 5));
+    assert_eq!(30, get_num_of_days_in_month(2003, 6));
+    assert_eq!(31, get_num_of_days_in_month(2003, 7));
+    assert_eq!(31, get_num_of_days_in_month(2003, 8));
+    assert_eq!(30, get_num_of_days_in_month(2003, 9));
     assert_eq!(31, get_num_of_days_in_month(2003, 10));
     assert_eq!(30, get_num_of_days_in_month(2003, 11));
     assert_eq!(31, get_num_of_days_in_month(2003, 12));
 
-    assert_eq!(31, get_num_of_days_in_month(2004, 01));
-    assert_eq!(29, get_num_of_days_in_month(2004, 02));
-    assert_eq!(31, get_num_of_days_in_month(2004, 03));
-    assert_eq!(30, get_num_of_days_in_month(2004, 04));
-    assert_eq!(31, get_num_of_days_in_month(2004, 05));
-    assert_eq!(30, get_num_of_days_in_month(2004, 06));
-    assert_eq!(31, get_num_of_days_in_month(2004, 07));
-    assert_eq!(31, get_num_of_days_in_month(2004, 08));
-    assert_eq!(30, get_num_of_days_in_month(2004, 09));
+    assert_eq!(31, get_num_of_days_in_month(2004, 1));
+    assert_eq!(29, get_num_of_days_in_month(2004, 2));
+    assert_eq!(31, get_num_of_days_in_month(2004, 3));
+    assert_eq!(30, get_num_of_days_in_month(2004, 4));
+    assert_eq!(31, get_num_of_days_in_month(2004, 5));
+    assert_eq!(30, get_num_of_days_in_month(2004, 6));
+    assert_eq!(31, get_num_of_days_in_month(2004, 7));
+    assert_eq!(31, get_num_of_days_in_month(2004, 8));
+    assert_eq!(30, get_num_of_days_in_month(2004, 9));
     assert_eq!(31, get_num_of_days_in_month(2004, 10));
     assert_eq!(30, get_num_of_days_in_month(2004, 11));
     assert_eq!(31, get_num_of_days_in_month(2004, 12));