aboutsummaryrefslogtreecommitdiff
path: root/src/Zcu.zig
diff options
context:
space:
mode:
authorDavid Rubin <daviru007@icloud.com>2024-08-25 22:43:57 -0700
committerDavid Rubin <daviru007@icloud.com>2024-08-25 22:43:57 -0700
commitf777b298327de95d2a54d814ca562c08fd7c7a87 (patch)
treeb6d4b3fe7925911cf861f22b0a668d78c3a6d223 /src/Zcu.zig
parentce92ccccc961992c00a10e714ce9e799956c50f2 (diff)
downloadzig-f777b298327de95d2a54d814ca562c08fd7c7a87.tar.gz
zig-f777b298327de95d2a54d814ca562c08fd7c7a87.zip
fix up merge conflicts with master
Diffstat (limited to 'src/Zcu.zig')
-rw-r--r--src/Zcu.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Zcu.zig b/src/Zcu.zig
index 0eaca2602a..7a03535c2f 100644
--- a/src/Zcu.zig
+++ b/src/Zcu.zig
@@ -2840,9 +2840,9 @@ pub fn addTypeReference(zcu: *Zcu, src_unit: AnalUnit, referenced_type: InternPo
gop.value_ptr.* = @intCast(ref_idx);
}
-pub fn errorSetBits(mod: *Zcu) u16 {
- if (mod.error_limit == 0) return 0;
- return @as(u16, std.math.log2_int(ErrorInt, mod.error_limit)) + 1;
+pub fn errorSetBits(zcu: *const Zcu) u16 {
+ if (zcu.error_limit == 0) return 0;
+ return @as(u16, std.math.log2_int(ErrorInt, zcu.error_limit)) + 1;
}
pub fn errNote(