diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-08-25 04:48:58 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-08-25 04:48:58 -0400 |
| commit | 815950996dcc92ac6ac285f2005dbac51b9cb6f8 (patch) | |
| tree | 1f77690a5fb7ccbef75bcab9c8c1e008ef3c5068 /src/analyze.cpp | |
| parent | 8aacfc846523aad142537b2bff49162d5feb6a91 (diff) | |
| parent | bf1f91595d4d3b5911632c671ef16e44d70dc9a6 (diff) | |
| download | zig-815950996dcc92ac6ac285f2005dbac51b9cb6f8.tar.gz zig-815950996dcc92ac6ac285f2005dbac51b9cb6f8.zip | |
Merge remote-tracking branch 'origin/master' into macos-stack-traces
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index eb43575d62..a8b3ea7132 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -3073,7 +3073,7 @@ static bool scope_is_root_decls(Scope *scope) { static void wrong_panic_prototype(CodeGen *g, AstNode *proto_node, TypeTableEntry *fn_type) { add_node_error(g, proto_node, - buf_sprintf("expected 'fn([]const u8, ?&builtin.StackTrace) unreachable', found '%s'", + buf_sprintf("expected 'fn([]const u8, ?*builtin.StackTrace) noreturn', found '%s'", buf_ptr(&fn_type->name))); } |