Browse Source

Merge pull request 'Zig 0.12.0-dev.2043 compatability changes for test runner' (#35) from drglove/exercises:zig-2043-changes into main

Reviewed-on: https://codeberg.org/ziglings/exercises/pulls/35
Chris Boesch 1 year ago
parent
commit
0d46acfa02
3 changed files with 9 additions and 8 deletions
  1. 2 1
      README.md
  2. 1 1
      build.zig
  3. 6 6
      test/tests.zig

+ 2 - 1
README.md

@@ -96,7 +96,8 @@ that if you update one, you may need to also update the other.
 
 
 ### Version Changes
 ### Version Changes
 
 
-Version-0.12.0-dev.1243
+Version-0.12.0-dev.2043
+* *2024-01-05* zig 0.12.0-dev.2043 - rename of `std.Build.FileSource` to `std.Build.LazyPath` - see[#16353](https://github.com/ziglang/zig/issues/16353)
 * *2023-10-24* zig 0.12.0-dev.1243 - changes in `std.ChildProcess`: renamed exec to run - see[#5853](https://github.com/ziglang/zig/issues/5853)
 * *2023-10-24* zig 0.12.0-dev.1243 - changes in `std.ChildProcess`: renamed exec to run - see[#5853](https://github.com/ziglang/zig/issues/5853)
 * *2023-06-26* zig 0.11.0-dev.4246 - changes in compile step (now it can be null)
 * *2023-06-26* zig 0.11.0-dev.4246 - changes in compile step (now it can be null)
 * *2023-06-26* zig 0.11.0-dev.3853 - removal of destination type from all cast builtins
 * *2023-06-26* zig 0.11.0-dev.3853 - removal of destination type from all cast builtins

+ 1 - 1
build.zig

@@ -15,7 +15,7 @@ const print = std.debug.print;
 //     1) Getting Started
 //     1) Getting Started
 //     2) Version Changes
 //     2) Version Changes
 comptime {
 comptime {
-    const required_zig = "0.12.0-dev.1243";
+    const required_zig = "0.12.0-dev.2043";
     const current_zig = builtin.zig_version;
     const current_zig = builtin.zig_version;
     const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
     const min_zig = std.SemanticVersion.parse(required_zig) catch unreachable;
     if (current_zig.order(min_zig) == .lt) {
     if (current_zig.order(min_zig) == .lt) {

+ 6 - 6
test/tests.zig

@@ -8,8 +8,8 @@ const mem = std.mem;
 
 
 const Allocator = std.mem.Allocator;
 const Allocator = std.mem.Allocator;
 const Child = std.process.Child;
 const Child = std.process.Child;
-const Build = std.build;
-const FileSource = std.Build.FileSource;
+const Build = std.Build;
+const LazyPath = std.Build.LazyPath;
 const Reader = fs.File.Reader;
 const Reader = fs.File.Reader;
 const RunStep = std.Build.RunStep;
 const RunStep = std.Build.RunStep;
 const Step = Build.Step;
 const Step = Build.Step;
@@ -132,9 +132,9 @@ fn createCase(b: *Build, name: []const u8) *Step {
 const CheckNamedStep = struct {
 const CheckNamedStep = struct {
     step: Step,
     step: Step,
     exercise: Exercise,
     exercise: Exercise,
-    stderr: FileSource,
+    stderr: LazyPath,
 
 
-    pub fn create(owner: *Build, exercise: Exercise, stderr: FileSource) *CheckNamedStep {
+    pub fn create(owner: *Build, exercise: Exercise, stderr: LazyPath) *CheckNamedStep {
         const self = owner.allocator.create(CheckNamedStep) catch @panic("OOM");
         const self = owner.allocator.create(CheckNamedStep) catch @panic("OOM");
         self.* = .{
         self.* = .{
             .step = Step.init(.{
             .step = Step.init(.{
@@ -180,12 +180,12 @@ const CheckNamedStep = struct {
 const CheckStep = struct {
 const CheckStep = struct {
     step: Step,
     step: Step,
     exercises: []const Exercise,
     exercises: []const Exercise,
-    stderr: FileSource,
+    stderr: LazyPath,
 
 
     pub fn create(
     pub fn create(
         owner: *Build,
         owner: *Build,
         exercises: []const Exercise,
         exercises: []const Exercise,
-        stderr: FileSource,
+        stderr: LazyPath,
     ) *CheckStep {
     ) *CheckStep {
         const self = owner.allocator.create(CheckStep) catch @panic("OOM");
         const self = owner.allocator.create(CheckStep) catch @panic("OOM");
         self.* = .{
         self.* = .{