diff options
| author | Chris Boesch <chrboesch@noreply.codeberg.org> | 2026-02-27 19:43:31 +0100 |
|---|---|---|
| committer | Chris Boesch <chrboesch@noreply.codeberg.org> | 2026-02-27 19:43:31 +0100 |
| commit | 88510735e13f8c5cd7bbb2d08ba1cbfd407dca04 (patch) | |
| tree | 26b711143cd31e89d3a2489d2ac6ab562e899eea /patches | |
| parent | 8c119bebdc66becac60e7ef035a993e422bd8972 (diff) | |
| parent | 07031c5daac4291e4d23599a944b84e6b434f9c2 (diff) | |
Merge branch 'main' into emphasize-for-loop-range
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/patches/065_builtins2.patch | 4 | ||||
| -rw-r--r-- | patches/patches/082_anonymous_structs3.patch | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/patches/patches/065_builtins2.patch b/patches/patches/065_builtins2.patch index ad4192b..89fd652 100644 --- a/patches/patches/065_builtins2.patch +++ b/patches/patches/065_builtins2.patch @@ -1,5 +1,5 @@ ---- exercises/065_builtins2.zig 2025-06-17 13:58:07.857258167 +0200 -+++ answers/065_builtins2.zig 2025-06-17 13:56:36.630415938 +0200 +--- exercises/065_builtins2.zig 2026-02-27 13:10:36 ++++ answers/065_builtins2.zig 2026-02-27 13:10:52 @@ -58,7 +58,7 @@ // Oops! We cannot leave the 'me' and 'myself' fields // undefined. Please set them here: diff --git a/patches/patches/082_anonymous_structs3.patch b/patches/patches/082_anonymous_structs3.patch index 0f71a94..28a6728 100644 --- a/patches/patches/082_anonymous_structs3.patch +++ b/patches/patches/082_anonymous_structs3.patch @@ -1,5 +1,5 @@ ---- exercises/082_anonymous_structs3.zig 2025-03-14 16:41:17.892873287 +0200 -+++ answers/082_anonymous_structs3.zig 2025-03-14 16:40:56.043829543 +0200 +--- exercises/082_anonymous_structs3.zig 2026-02-27 13:05:46 ++++ answers/082_anonymous_structs3.zig 2026-02-27 13:07:22 @@ -82,14 +82,14 @@ // @typeInfo(Circle).@"struct".fields // @@ -17,9 +17,9 @@ // 3. Print the field's name, type, and value. // // Each 'field' in this loop is one of these: -@@ -119,9 +119,9 @@ +@@ -123,9 +123,9 @@ + // for declarations. If it's a value, it looks for data. // - // The first field should print as: "0"(bool):true print("\"{s}\"({any}):{any} ", .{ - field.???, - field.???, |