diff options
author | 2023-02-23 23:57:19 -0800 | |
---|---|---|
committer | 2023-02-23 23:57:19 -0800 | |
commit | 3f04f8d0a653cf5decef2225c2044742b382718a (patch) | |
tree | 91eb6500834e3157ecb9ab208101aa368a1191c8 /src/analytics | |
parent | b5bdde28ed34070cbb1d34d13f414f4c513ee40d (diff) | |
download | bun-3f04f8d0a653cf5decef2225c2044742b382718a.tar.gz bun-3f04f8d0a653cf5decef2225c2044742b382718a.tar.zst bun-3f04f8d0a653cf5decef2225c2044742b382718a.zip |
Upgrade Zig (#2151)
* fixup
* Upgrade Zig
* Remove bad assertion
* strings
* bump
* mode -> optimize
* optimize
* Linux build
* Update bindgen.zig
Diffstat (limited to 'src/analytics')
-rw-r--r-- | src/analytics/analytics_thread.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/analytics/analytics_thread.zig b/src/analytics/analytics_thread.zig index f4c799849..06b882901 100644 --- a/src/analytics/analytics_thread.zig +++ b/src/analytics/analytics_thread.zig @@ -261,13 +261,13 @@ pub const GenerateHeader = struct { pub const GeneratePlatform = struct { var osversion_name: [32]u8 = undefined; pub fn forMac() Analytics.Platform { - std.mem.set(u8, std.mem.span(&osversion_name), 0); + @memset(&osversion_name, 0, osversion_name.len); var platform = Analytics.Platform{ .os = Analytics.OperatingSystem.macos, .version = &[_]u8{}, .arch = platform_arch }; var len = osversion_name.len - 1; if (std.c.sysctlbyname("kern.osrelease", &osversion_name, &len, null, 0) == -1) return platform; - platform.version = std.mem.span(std.mem.sliceTo(std.mem.span(&osversion_name), @as(u8, 0))); + platform.version = bun.sliceTo(&osversion_name, 0); return platform; } @@ -292,7 +292,7 @@ pub const GenerateHeader = struct { @compileError("This function is only implemented on Linux"); } _ = forOS(); - const release = std.mem.span(&linux_os_name.release); + const release = bun.sliceTo(&linux_os_name.release, 0); const sliced_string = Semver.SlicedString.init(release, release); const result = Semver.Version.parse(sliced_string, bun.default_allocator); // we only care about major, minor, patch so we don't care about the string @@ -304,8 +304,8 @@ pub const GenerateHeader = struct { _ = std.c.uname(&linux_os_name); - const release = std.mem.span(&linux_os_name.release); - const version = std.mem.sliceTo(std.mem.span(&linux_os_name.version).ptr, @as(u8, 0)); + const release = bun.sliceTo(&linux_os_name.release, 0); + const version = std.mem.sliceTo(&linux_os_name.version, @as(u8, 0)); // Linux DESKTOP-P4LCIEM 5.10.16.3-microsoft-standard-WSL2 #1 SMP Fri Apr 2 22:23:49 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux if (std.mem.indexOf(u8, release, "microsoft") != null) { return Analytics.Platform{ .os = Analytics.OperatingSystem.wsl, .version = version, .arch = platform_arch }; |