Skip to content

Commit

Permalink
Merge branch 'main' of github.com:ratfactor/ziglings into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ratfactor committed Feb 11, 2021
2 parents 5b47e8e + f1f56fd commit 7310242
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions exercises/02_std.zig
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ pub fn main() void {
std.debug.print("Standard Library.\n", .{});
}

// Going deeper: imports must be declared as "constants" (with the 'const'
// keyword rather than "variables" (with the 'var' keyword) is that they
// can only be used at "compile time" rather than "run time". Zig evaluates
// const values at compile time. Don't worry if none of this makes sense
// yet! See also this answer: https://stackoverflow.com/a/62567550/695615
// For the curious: Imports must be declared as constants because they
// can only be used at compile time rather than run time. Zig evaluates
// constant values at compile time. Don't worry, we'll cover imports
// in detail later.
// See also this answer: https://stackoverflow.com/a/62567550/695615
2 changes: 1 addition & 1 deletion exercises/22_errors2.zig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// What happens if getText() can't find 'foo.txt'? How do we express
// this in Zig?
//
// Zig let's us make what's called an "error union" which is a value
// Zig lets us make what's called an "error union" which is a value
// which could either be a regular value OR an error from a set:
//
// var text: MyErrorSet!Text = getText('foo.txt');
Expand Down

0 comments on commit 7310242

Please sign in to comment.