Merge pull request #77 from jhalmen/fmt

whitespaces and zig fmt
This commit is contained in:
Dave Gauer 2021-11-07 19:38:47 -05:00 committed by GitHub
commit c7868de511
22 changed files with 46 additions and 47 deletions

View file

@ -31,5 +31,5 @@ pub fn main() void {
} }
fn printPhrase(part1: []u8, part2: []u8, part3: []u8) void { fn printPhrase(part1: []u8, part2: []u8, part3: []u8) void {
std.debug.print("'{s} {s} {s}.' ", .{part1, part2, part3}); std.debug.print("'{s} {s} {s}.' ", .{ part1, part2, part3 });
} }

View file

@ -54,7 +54,7 @@ pub fn main() void {
// //
// Also, check out our fancy formatting! b:0>4 means, "print // Also, check out our fancy formatting! b:0>4 means, "print
// as a binary number, zero-pad right-aligned four digits." // as a binary number, zero-pad right-aligned four digits."
print("{b:0>4} + {b:0>4} = {b:0>4} ({})", .{a, b, my_result, overflowed}); print("{b:0>4} + {b:0>4} = {b:0>4} ({})", .{ a, b, my_result, overflowed });
print(". Furthermore, ", .{}); print(". Furthermore, ", .{});
@ -70,5 +70,5 @@ pub fn main() void {
// this builtin to reverse the bits of a u8 integer. // this builtin to reverse the bits of a u8 integer.
const input: u8 = 0b11110000; const input: u8 = 0b11110000;
const tupni: u8 = @bitReverse(input); const tupni: u8 = @bitReverse(input);
print("{b:0>8} backwards is {b:0>8}.\n", .{input, tupni}); print("{b:0>8} backwards is {b:0>8}.\n", .{ input, tupni });
} }

View file

@ -53,7 +53,7 @@ const Narcissus = struct {
}; };
pub fn main() void { pub fn main() void {
var narcissus: Narcissus = Narcissus {}; var narcissus: Narcissus = Narcissus{};
// Oops! We cannot leave the 'me' and 'myself' fields // Oops! We cannot leave the 'me' and 'myself' fields
// undefined. Please set them here: // undefined. Please set them here:
@ -70,7 +70,7 @@ pub fn main() void {
// fix this call: // fix this call:
const T2 = narcissus.fetchTheMostBeautifulType(); const T2 = narcissus.fetchTheMostBeautifulType();
print("A {} loves all {}es. ", .{T1, T2}); print("A {} loves all {}es. ", .{ T1, T2 });
// His final words as he was looking in // His final words as he was looking in
// those waters he habitually watched // those waters he habitually watched

View file

@ -46,7 +46,7 @@ pub fn main() void {
const const_int = 12345; const const_int = 12345;
const const_float = 987.654; const const_float = 987.654;
print("Immutable: {}, {d:.3}; ", .{const_int, const_float}); print("Immutable: {}, {d:.3}; ", .{ const_int, const_float });
// But something changes when we assign the exact same values // But something changes when we assign the exact same values
// to identifiers mutably with "var". // to identifiers mutably with "var".
@ -69,7 +69,7 @@ pub fn main() void {
var_int = 54321; var_int = 54321;
var_float = 456.789; var_float = 456.789;
print("Mutable: {}, {d:.3}; ", .{var_int, var_float}); print("Mutable: {}, {d:.3}; ", .{ var_int, var_float });
// Bonus: Now that we're familiar with Zig's builtins, we can // Bonus: Now that we're familiar with Zig's builtins, we can
// also inspect the types to see what they are, no guessing // also inspect the types to see what they are, no guessing

View file

@ -49,7 +49,7 @@ pub fn main() void {
count += 1; count += 1;
var a4: [count]u8 = .{'D'} ** count; var a4: [count]u8 = .{'D'} ** count;
print("{s} {s} {s} {s}\n", .{a1, a2, a3, a4}); print("{s} {s} {s} {s}\n", .{ a1, a2, a3, a4 });
// Builtin BONUS! // Builtin BONUS!
// //

View file

@ -62,9 +62,9 @@ const Schooner = struct {
}; };
pub fn main() void { pub fn main() void {
var whale = Schooner {.name = "Whale"}; var whale = Schooner{ .name = "Whale" };
var shark = Schooner {.name = "Shark"}; var shark = Schooner{ .name = "Shark" };
var minnow = Schooner {.name = "Minnow"}; var minnow = Schooner{ .name = "Minnow" };
// Hey, we can't just pass this runtime variable as an // Hey, we can't just pass this runtime variable as an
// argument to the scaleMe() method. What would let us do // argument to the scaleMe() method. What would let us do

View file

@ -20,7 +20,7 @@ pub fn main() void {
const s2 = makeSequence(u32, 5); // creates a [5]u32 const s2 = makeSequence(u32, 5); // creates a [5]u32
const s3 = makeSequence(i64, 7); // creates a [7]i64 const s3 = makeSequence(i64, 7); // creates a [7]i64
print("s1={any}, s2={any}, s3={any}\n", .{s1, s2, s3}); print("s1={any}, s2={any}, s3={any}\n", .{ s1, s2, s3 });
} }
// This function is pretty wild because it executes at runtime // This function is pretty wild because it executes at runtime

View file

@ -54,12 +54,12 @@ fn makePath(from: *Place, to: *Place, dist: u8) Path {
// Using our new function, these path definitions take up considerably less // Using our new function, these path definitions take up considerably less
// space in our program now! // space in our program now!
const a_paths = [_]Path{ makePath(&a, &b, 2) }; const a_paths = [_]Path{makePath(&a, &b, 2)};
const b_paths = [_]Path{ makePath(&b, &a, 2), makePath(&b, &d, 1) }; const b_paths = [_]Path{ makePath(&b, &a, 2), makePath(&b, &d, 1) };
const c_paths = [_]Path{ makePath(&c, &d, 3), makePath(&c, &e, 2) }; const c_paths = [_]Path{ makePath(&c, &d, 3), makePath(&c, &e, 2) };
const d_paths = [_]Path{ makePath(&d, &b, 1), makePath(&d, &c, 3), makePath(&d, &f, 7) }; const d_paths = [_]Path{ makePath(&d, &b, 1), makePath(&d, &c, 3), makePath(&d, &f, 7) };
const e_paths = [_]Path{ makePath(&e, &c, 2), makePath(&e, &f, 1) }; const e_paths = [_]Path{ makePath(&e, &c, 2), makePath(&e, &f, 1) };
const f_paths = [_]Path{ makePath(&f, &d, 7) }; const f_paths = [_]Path{makePath(&f, &d, 7)};
// //
// But is it more readable? That could be argued either way. // But is it more readable? That could be argued either way.
// //

View file

@ -50,7 +50,7 @@ pub fn main() void {
// //
// Luckily, the 'length' field makes it possible to still // Luckily, the 'length' field makes it possible to still
// work with this value. // work with this value.
const foo = WeirdContainer { const foo = WeirdContainer{
.data = "Weird Data!", .data = "Weird Data!",
.length = 11, .length = 11,
}; };

View file

@ -26,4 +26,3 @@ fn foo() void {
suspend {} suspend {}
print("async!\n", .{}); print("async!\n", .{});
} }

View file

@ -44,7 +44,7 @@ pub fn main() void {
var com_title = com_frame; var com_title = com_frame;
var org_title = org_frame; var org_title = org_frame;
print(".com: {s}, .org: {s}.\n", .{com_title, org_title}); print(".com: {s}, .org: {s}.\n", .{ com_title, org_title });
} }
fn getPageTitle(url: []const u8) []const u8 { fn getPageTitle(url: []const u8) []const u8 {