Merge remote-tracking branch 'upstream/main' into fix-enum-variant-inconsistency

1 files changed, 12 insertions, 16 deletions

diff --git a/exercises/18_iterators/iterators4.rs b/exercises/18_iterators/iterators4.rs
index 79e1692..8381dbb 100644
--- a/exercises/18_iterators/iterators4.rs
+++ b/exercises/18_iterators/iterators4.rs
@@ -1,20 +1,16 @@
-// iterators4.rs
-//
-// Execute `rustlings hint iterators4` or use the `hint` watch subcommand for a
-// hint.
-
-// I AM NOT DONE
-
-pub fn factorial(num: u64) -> u64 {
-    // Complete this function to return the factorial of num
+fn factorial(num: u64) -> u64 {
+    // TODO: Complete this function to return the factorial of `num`.
     // Do not use:
-    // - return
+    // - early returns (using the `return` keyword explicitly)
     // Try not to use:
-    // - imperative style loops (for, while)
+    // - imperative style loops (for/while)
     // - additional variables
     // For an extra challenge, don't use:
     // - recursion
-    // Execute `rustlings hint iterators4` for hints.
+}
+
+fn main() {
+    // You can optionally experiment here.
 }
 
 #[cfg(test)]
@@ -23,20 +19,20 @@ mod tests {
 
     #[test]
     fn factorial_of_0() {
-        assert_eq!(1, factorial(0));
+        assert_eq!(factorial(0), 1);
     }
 
     #[test]
     fn factorial_of_1() {
-        assert_eq!(1, factorial(1));
+        assert_eq!(factorial(1), 1);
     }
     #[test]
     fn factorial_of_2() {
-        assert_eq!(2, factorial(2));
+        assert_eq!(factorial(2), 2);
     }
 
     #[test]
     fn factorial_of_4() {
-        assert_eq!(24, factorial(4));
+        assert_eq!(factorial(4), 24);
     }
 }