# Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/615d45da779842715a3ab65b59233e9cfb4fa122)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: 615d45da779842715a3ab65b59233e9cfb4fa122

Requested commit: 615d45da779842715a3ab65b59233e9cfb4fa122

Commit: 615d45da779842715a3ab65b59233e9cfb4fa122

Tree: 9c269e8fa9beded00954d82ebc0c95d56c485322

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
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.

```

## Parents

- [1d3f76bbda90f810a24845c15516235d91ee12ad](https://git.cafe/gitcafe/zig/commit/1d3f76bbda90f810a24845c15516235d91ee12ad?format=markdown)

- [0dd0c9620d66afcfabaf3dcb21b636530fd0ccba](https://git.cafe/gitcafe/zig/commit/0dd0c9620d66afcfabaf3dcb21b636530fd0ccba?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/615d45da779842715a3ab65b59233e9cfb4fa122?format=markdown)