std: update to new std.time.epoch

Author: wooster0

lib/compiler/aro/aro/Compilation.zig

@@ -1,7 +1,6 @@
 const std = @import("std");
 const Allocator = mem.Allocator;
 const assert = std.debug.assert;
-const EpochSeconds = std.time.epoch.EpochSeconds;
 const mem = std.mem;
 const Interner = @import("../backend.zig").Interner;
 const Builtins = @import("Builtins.zig");
@@ -200,20 +199,20 @@ fn getTimestamp(comp: *Compilation) !u47 {
 }
 
 fn generateDateAndTime(w: anytype, timestamp: u47) !void {
-    const epoch_seconds = EpochSeconds{ .secs = timestamp };
-    const epoch_day = epoch_seconds.getEpochDay();
-    const day_seconds = epoch_seconds.getDaySeconds();
-    const year_day = epoch_day.calculateYearDay();
-    const month_day = year_day.calculateMonthDay();
+    const seconds = std.time.epoch.Seconds{ .secs = timestamp };
+    const days = seconds.getDays();
+    const day_seconds = seconds.getSecondsIntoDay();
+    const year_and_days = days.calculateYearAndDays();
+    const month_and_day = year_and_days.calculateMonthAndDay();
 
     const month_names = [_][]const u8{ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
     std.debug.assert(std.time.epoch.Month.jan.numeric() == 1);
 
-    const month_name = month_names[month_day.month.numeric() - 1];
+    const month_name = month_names[month_and_day.month.numeric() - 1];
     try w.print("#define __DATE__ \"{s} {d: >2} {d}\"\n", .{
         month_name,
-        month_day.day_index + 1,
-        year_day.year,
+        month_and_day.day_index + 1,
+        year_and_days.year,
     });
     try w.print("#define __TIME__ \"{d:0>2}:{d:0>2}:{d:0>2}\"\n", .{
         day_seconds.getHoursIntoDay(),
@@ -222,15 +221,15 @@ fn generateDateAndTime(w: anytype, timestamp: u47) !void {
     });
 
     const day_names = [_][]const u8{ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" };
-    const day_name = day_names[@intCast((epoch_day.day + 3) % 7)];
+    const day_name = day_names[@intCast((days.days + 3) % 7)];
     try w.print("#define __TIMESTAMP__ \"{s} {s} {d: >2} {d:0>2}:{d:0>2}:{d:0>2} {d}\"\n", .{
         day_name,
         month_name,
-        month_day.day_index + 1,
+        month_and_day.day_index + 1,
         day_seconds.getHoursIntoDay(),
         day_seconds.getMinutesIntoHour(),
         day_seconds.getSecondsIntoMinute(),
-        year_day.year,
+        year_and_days.year,
     });
 }
 

lib/std/crypto/Certificate.zig

@@ -598,7 +598,7 @@ const Date = struct {
             var year: u16 = 1970;
             while (year < date.year) : (year += 1) {
                 const days: u64 = std.time.epoch.getDaysInYear(year);
-                sec += days * std.time.epoch.secs_per_day;
+                sec += days * std.time.s_per_day;
             }
         }
 
@@ -609,11 +609,11 @@ const Date = struct {
                     date.year,
                     @enumFromInt(month),
                 );
-                sec += days * std.time.epoch.secs_per_day;
+                sec += days * std.time.s_per_day;
             }
         }
 
-        sec += (date.day - 1) * @as(u64, std.time.epoch.secs_per_day);
+        sec += (date.day - 1) * @as(u64, std.time.s_per_day);
         sec += date.hour * @as(u64, 60 * 60);
         sec += date.minute * @as(u64, 60);
         sec += date.second;