Skip to content

Commit

Permalink
Merge pull request 'Nobody wants the long version of finding out if a…
Browse files Browse the repository at this point in the history
… variable is set.' (ratfactor#94) from minor_improvements into main

Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/94
  • Loading branch information
Chris Boesch committed May 10, 2024
2 parents dfdaf03 + 67f87a7 commit 49c54fb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
4 changes: 1 addition & 3 deletions exercises/046_optionals2.zig
Original file line number Diff line number Diff line change
Expand Up @@ -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 ???
}
}
13 changes: 6 additions & 7 deletions patches/patches/046_optionals2.patch
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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;
}
}

0 comments on commit 49c54fb

Please sign in to comment.