Chris Boesch 11 месяцев назад
Родитель
Сommit
d1b49f353e
3 измененных файлов с 10 добавлено и 12 удалено
  1. 1 3
      build.zig
  2. 3 3
      exercises/108_labeled_switch.zig
  3. 6 6
      patches/patches/108_labeled_switch.patch

+ 1 - 3
build.zig

@@ -1199,9 +1199,7 @@ const exercises = [_]Exercise{
     },
     .{
         .main_file = "108_labeled_switch.zig",
-        .output =
-        \\The pull request has been merged
-        ,
+        .output = "The pull request has been merged.",
     },
     .{
         .main_file = "999_the_end.zig",

+ 3 - 3
exercises/108_labeled_switch.zig

@@ -63,15 +63,15 @@ const PullRequestState = enum(u8) {
 pub fn main() void {
     // Oh no, your pull request keeps being rejected,
     // how would you fix it?
-    pr: switch (@as(PullRequestState, PullRequestState.Draft)) {
+    pr: switch (PullRequestState.Draft) {
         PullRequestState.Draft => continue :pr PullRequestState.InReview,
         PullRequestState.InReview => continue :pr PullRequestState.Rejected,
         PullRequestState.Approved => continue :pr PullRequestState.Merged,
         PullRequestState.Rejected => {
-            std.debug.print("The pull request has been rejected", .{});
+            std.debug.print("The pull request has been rejected.\n", .{});
             return;
         },
         PullRequestState.Merged => break, // Would you know where to break to?
     }
-    std.debug.print("The pull request has been merged", .{});
+    std.debug.print("The pull request has been merged.\n", .{});
 }

+ 6 - 6
patches/patches/108_labeled_switch.patch

@@ -1,18 +1,18 @@
---- a/exercises/108_labeled_switch.zig
-+++ b/exercises/108_labeled_switch.zig
-@@ -65,13 +65,13 @@ pub fn main() void {
+--- exercises/108_labeled_switch.zig	2024-09-20 12:09:24.370066539 +0200
++++ answers/108_labeled_switch.zig	2024-09-20 12:09:06.499711739 +0200
+@@ -65,13 +65,13 @@
      // how would you fix it?
-     pr: switch (@as(PullRequestState, PullRequestState.Draft)) {
+     pr: switch (PullRequestState.Draft) {
          PullRequestState.Draft => continue :pr PullRequestState.InReview,
 -        PullRequestState.InReview => continue :pr PullRequestState.Rejected,
 +        PullRequestState.InReview => continue :pr PullRequestState.Approved,
          PullRequestState.Approved => continue :pr PullRequestState.Merged,
          PullRequestState.Rejected => {
-             std.debug.print("The pull request has been rejected", .{});
+             std.debug.print("The pull request has been rejected.\n", .{});
              return;
          },
 -        PullRequestState.Merged => break, // Would you know where to break to?
 +        PullRequestState.Merged => break :pr, // Would you know where to break to?
      }
-     std.debug.print("The pull request has been merged", .{});
+     std.debug.print("The pull request has been merged.\n", .{});
  }