summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Boesch <chrboesch@noreply.codeberg.org>2024-09-04 20:52:42 +0200
committerChris Boesch <chrboesch@noreply.codeberg.org>2024-09-04 20:52:42 +0200
commit7f1df869382bcb4dfc7847d72c24cdd915fb579d (patch)
tree763e19593357f511c9bdb98311b9323146a9457d
parent2e5b570aef6cae57d00a253da61a62a504146a09 (diff)
Reseted the simplification for de-referencing.
-rw-r--r--README.md2
-rw-r--r--exercises/046_optionals2.zig2
-rw-r--r--patches/patches/046_optionals2.patch4
3 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index 7b8c8c1..5853d7e 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ that if you update one, you may need to also update the other.
### Version Changes
Version-0.14.0-dev.1224
-* *2024-07-02* zig 0.14.0-dev.1409 - several changes in std.builtin, see [#21225](https://github.com/ziglang/zig/pull/21225)
+* *2024-09-02* zig 0.14.0-dev.1409 - several changes in std.builtin, see [#21225](https://github.com/ziglang/zig/pull/21225)
* *2024-08-04* zig 0.14.0-dev.1224 - several changes in build system, see [#21115](https://github.com/ziglang/zig/pull/21115)
* *2024-08-04* zig 0.14.0-dev.839 - several changes in build system, see [#20580](https://github.com/ziglang/zig/pull/20580), [#20600](https://github.com/ziglang/zig/issues/20600)
* *2024-06-17* zig 0.14.0-dev.42 - changes in `std.mem.split and tokenize` - see [#15579](https://github.com/ziglang/zig/pull/15579)
diff --git a/exercises/046_optionals2.zig b/exercises/046_optionals2.zig
index 86654f7..a5436d9 100644
--- a/exercises/046_optionals2.zig
+++ b/exercises/046_optionals2.zig
@@ -48,7 +48,7 @@ pub fn main() void {
// If e1 and e2 are valid pointers to elephants,
// this function links the elephants so that e1's tail "points" to e2.
fn linkElephants(e1: ?*Elephant, e2: ?*Elephant) void {
- e1.?.tail = e2;
+ e1.?.*.tail = e2.?;
}
// This function visits all elephants once, starting with the
diff --git a/patches/patches/046_optionals2.patch b/patches/patches/046_optionals2.patch
index 9229f05..1b364a6 100644
--- a/patches/patches/046_optionals2.patch
+++ b/patches/patches/046_optionals2.patch
@@ -1,5 +1,5 @@
---- exercises/046_optionals2.zig 2024-06-23 19:43:16
-+++ answers/046_optionals2.zig 2024-06-23 19:42:46
+--- exercises/046_optionals2.zig 2024-09-04 20:51:36.766783971 +0200
++++ answers/046_optionals2.zig 2024-09-04 20:51:01.389400985 +0200
@@ -22,7 +22,7 @@
const Elephant = struct {