aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-10-22 17:36:18 -0400
committerGitHub <noreply@github.com>2020-10-22 17:36:18 -0400
commite6ac082437b87fccf6a7e592f813d3403427e512 (patch)
tree4c61a3a5d19afd57cf1b20010179ccbf538347c2 /doc
parent78199a684f50f37f652dabcc88b02e8b998ab5fa (diff)
parent475fc2934b9bb4c0c10ca213c4322cc902c4b303 (diff)
downloadzig-e6ac082437b87fccf6a7e592f813d3403427e512.tar.gz
zig-e6ac082437b87fccf6a7e592f813d3403427e512.zip
Merge pull request #6744 from LemonBoy/intcast-vec
stage1: Implement `@intCast` between vectors
Diffstat (limited to 'doc')
-rw-r--r--doc/docgen.zig6
-rw-r--r--doc/langref.html.in4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/docgen.zig b/doc/docgen.zig
index 52f373f5b1..6916318eb2 100644
--- a/doc/docgen.zig
+++ b/doc/docgen.zig
@@ -1251,7 +1251,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: any
},
}
if (mem.indexOf(u8, result.stderr, error_match) == null) {
- print("{}\nExpected to find '{}' in stderr", .{ result.stderr, error_match });
+ print("{}\nExpected to find '{}' in stderr\n", .{ result.stderr, error_match });
return parseError(tokenizer, code.source_token, "example did not have expected compile error", .{});
}
const escaped_stderr = try escapeHtml(allocator, result.stderr);
@@ -1306,7 +1306,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: any
},
}
if (mem.indexOf(u8, result.stderr, error_match) == null) {
- print("{}\nExpected to find '{}' in stderr", .{ result.stderr, error_match });
+ print("{}\nExpected to find '{}' in stderr\n", .{ result.stderr, error_match });
return parseError(tokenizer, code.source_token, "example did not have expected runtime safety error message", .{});
}
const escaped_stderr = try escapeHtml(allocator, result.stderr);
@@ -1385,7 +1385,7 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: any
},
}
if (mem.indexOf(u8, result.stderr, error_match) == null) {
- print("{}\nExpected to find '{}' in stderr", .{ result.stderr, error_match });
+ print("{}\nExpected to find '{}' in stderr\n", .{ result.stderr, error_match });
return parseError(tokenizer, code.source_token, "example did not have expected compile error message", .{});
}
const escaped_stderr = try escapeHtml(allocator, result.stderr);
diff --git a/doc/langref.html.in b/doc/langref.html.in
index a7d685dc9a..e6bdb63128 100644
--- a/doc/langref.html.in
+++ b/doc/langref.html.in
@@ -8713,7 +8713,7 @@ fn foo(x: []const u8) u8 {
{#header_close#}
{#header_open|Cast Negative Number to Unsigned Integer#}
<p>At compile-time:</p>
- {#code_begin|test_err|cannot cast negative value -1 to unsigned integer type 'u32'#}
+ {#code_begin|test_err|attempt to cast negative value to unsigned integer#}
comptime {
const value: i32 = -1;
const unsigned = @intCast(u32, value);
@@ -8735,7 +8735,7 @@ pub fn main() void {
{#header_close#}
{#header_open|Cast Truncates Data#}
<p>At compile-time:</p>
- {#code_begin|test_err|integer value 300 cannot be coerced to type 'u8'#}
+ {#code_begin|test_err|cast from 'u16' to 'u8' truncates bits#}
comptime {
const spartan_count: u16 = 300;
const byte = @intCast(u8, spartan_count);