diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-05-17 19:30:38 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-05-17 19:30:38 -0700 |
| commit | 615d45da779842715a3ab65b59233e9cfb4fa122 (patch) | |
| tree | 9c269e8fa9beded00954d82ebc0c95d56c485322 /src/Module.zig | |
| parent | 1d3f76bbda90f810a24845c15516235d91ee12ad (diff) | |
| parent | 0dd0c9620d66afcfabaf3dcb21b636530fd0ccba (diff) | |
| download | zig-615d45da779842715a3ab65b59233e9cfb4fa122.tar.gz zig-615d45da779842715a3ab65b59233e9cfb4fa122.zip | |
Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen
Conflicts:
* src/codegen/spirv.zig
* src/link/SpirV.zig
We're going to want to improve the stage2 test harness to print
the source file name when a compile error occurs otherwise std lib
contributors are going to see some confusing CI failures when they cause
stage2 AstGen compile errors.
Diffstat (limited to 'src/Module.zig')
| -rw-r--r-- | src/Module.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Module.zig b/src/Module.zig index 39caa24d75..cf653ed9ca 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -4430,7 +4430,7 @@ pub const SwitchProngSrc = union(enum) { log.warn("unable to load {s}: {s}", .{ decl.namespace.file_scope.sub_file_path, @errorName(err), }); - return LazySrcLoc{ .node_offset = 0}; + return LazySrcLoc{ .node_offset = 0 }; }; const switch_node = decl.relativeToNodeIndex(switch_node_offset); const main_tokens = tree.nodes.items(.main_token); |