Просмотр исходного кода

Merge pull request 'Nobody wants the long version of finding out if a variable is set.' (#94) from minor_improvements into main

Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/94
Chris Boesch 1 год назад
Родитель
Сommit
49c54fb075
2 измененных файлов с 7 добавлено и 10 удалено
  1. 1 3
      exercises/046_optionals2.zig
  2. 6 7
      patches/patches/046_optionals2.patch

+ 1 - 3
exercises/046_optionals2.zig

@@ -51,8 +51,6 @@ fn visitElephants(first_elephant: *Elephant) void {
         // We should stop once we encounter a tail that
         // does NOT point to another element. What can
         // we put here to make that happen?
-        if (e.tail == null) ???;
-
-        e = e.tail.?;
+        e = e.tail ???
     }
 }

+ 6 - 7
patches/patches/046_optionals2.patch

@@ -1,5 +1,5 @@
---- exercises/046_optionals2.zig	2023-10-03 22:15:22.122241138 +0200
-+++ answers/046_optionals2.zig	2023-10-05 20:04:07.049433424 +0200
+--- exercises/046_optionals2.zig	2024-05-10 23:11:25.796632478 +0200
++++ answers/046_optionals2.zig	2024-05-10 23:10:16.115335668 +0200
 @@ -21,7 +21,7 @@
  
  const Elephant = struct {
@@ -9,12 +9,11 @@
      visited: bool = false,
  };
  
-@@ -51,7 +51,7 @@
+@@ -51,6 +51,6 @@
          // We should stop once we encounter a tail that
          // does NOT point to another element. What can
          // we put here to make that happen?
--        if (e.tail == null) ???;
-+        if (e.tail == null) break;
- 
-         e = e.tail.?;
+-        e = e.tail ???
++        e = e.tail orelse break;
      }
+ }