Re-sync patches with current changes
parent
de322fab46
commit
9209879d73
@ -1,12 +1,12 @@
|
|||||||
22c22
|
25c25
|
||||||
< const d: u8 = ziggy[???];
|
< const d: u8 = ziggy[???];
|
||||||
---
|
---
|
||||||
> const d: u8 = ziggy[4];
|
> const d: u8 = ziggy[4];
|
||||||
26c26
|
29c29
|
||||||
< const laugh = "ha " ???;
|
< const laugh = "ha " ???;
|
||||||
---
|
---
|
||||||
> const laugh = "ha " ** 3;
|
> const laugh = "ha " ** 3;
|
||||||
33c33
|
36c36
|
||||||
< const major_tom = major ??? tom;
|
< const major_tom = major ??? tom;
|
||||||
---
|
---
|
||||||
> const major_tom = major ++ " " ++ tom;
|
> const major_tom = major ++ " " ++ tom;
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
32c32
|
34c34
|
||||||
< blue = ???,
|
< blue = ???,
|
||||||
---
|
---
|
||||||
> blue = 0x0000ff,
|
> blue = 0x0000ff,
|
||||||
54c54
|
56c56
|
||||||
< \\ <span style="color: #{}">Blue</span>
|
< \\ <span style="color: #{}">Blue</span>
|
||||||
---
|
---
|
||||||
> \\ <span style="color: #{x:0>6}">Blue</span>
|
> \\ <span style="color: #{x:0>6}">Blue</span>
|
||||||
59c59
|
62c62
|
||||||
< @enumToInt(???), // Oops! We're missing something!
|
< @enumToInt(???), // Oops! We're missing something!
|
||||||
---
|
---
|
||||||
> @enumToInt(Color.blue), // Oops! We're missing something!
|
> @enumToInt(Color.blue), // Oops! We're missing something!
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
96c96
|
95c95
|
||||||
< const print = ???;
|
< const print = ???;
|
||||||
---
|
---
|
||||||
> const print = std.debug.print;
|
> const print = std.debug.print;
|
||||||
152c152
|
160c160
|
||||||
< levelUp(glorp, reward_xp);
|
< levelUp(glorp, reward_xp);
|
||||||
---
|
---
|
||||||
> levelUp(&glorp, reward_xp);
|
> levelUp(&glorp, reward_xp);
|
||||||
157c157
|
166c166
|
||||||
< fn levelUp(character_access: Character, xp: u32) void {
|
< fn levelUp(character_access: Character, xp: u32) void {
|
||||||
---
|
---
|
||||||
> fn levelUp(character_access: *Character, xp: u32) void {
|
> fn levelUp(character_access: *Character, xp: u32) void {
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
34,35c34,35
|
35,36c35,36
|
||||||
< const hand1: []u8 = cards[???];
|
< const hand1: []u8 = cards[???];
|
||||||
< const hand2: []u8 = cards[???];
|
< const hand2: []u8 = cards[???];
|
||||||
---
|
---
|
||||||
> const hand1: []u8 = cards[0..4];
|
> const hand1: []u8 = cards[0..4];
|
||||||
> const hand2: []u8 = cards[4..];
|
> const hand2: []u8 = cards[4..];
|
||||||
45c45
|
46c46
|
||||||
< fn printHand(hand: ???) void {
|
< fn printHand(hand: ???) void {
|
||||||
---
|
---
|
||||||
> fn printHand(hand: []u8) void {
|
> fn printHand(hand: []u8) void {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
33c33
|
35c35
|
||||||
< const zen12_string: []const u8 = zen_manyptr;
|
< const zen12_string: []const u8 = zen_manyptr;
|
||||||
---
|
---
|
||||||
> const zen12_string: []const u8 = zen_manyptr[0..21];
|
> const zen12_string: []const u8 = zen_manyptr[0..21];
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
83c83
|
86c86
|
||||||
< for (???) |s| {
|
< for (???) |s| {
|
||||||
---
|
---
|
||||||
> for (my_seq) |s| {
|
> for (my_seq) |s| {
|
||||||
95c95
|
98c98
|
||||||
< while (??? != my_sentinel) {
|
< while (??? != my_sentinel) {
|
||||||
---
|
---
|
||||||
> while (my_seq[i] != my_sentinel) {
|
> while (my_seq[i] != my_sentinel) {
|
||||||
|
Loading…
Reference in New Issue