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

Merge pull request 'Reseted the simplification for de-referencing.' (#154) from i152 into main

Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/154
Chris Boesch 11 месяцев назад
Родитель
Сommit
c9a98ad555
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      exercises/046_optionals2.zig
  2. 2 2
      patches/patches/046_optionals2.patch

+ 1 - 1
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

+ 2 - 2
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 {