| author |  Andrew Kelley <andrew@ziglang.org> 2026-09-13 19:46:08-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2026-09-16 13:12:47-07:00 |
| log | 88f3896522fa5314fa4b19b06a2fd3675233ddc3 |
| tree | 1b59841631c65e2bbe071400a8f2c6a7eeb93be7 |
| parent | 92439e73d06dfda221043830c23cad836d8232a5 |
std: update to new Cache API
6 files changed, 13 insertions(+), 13 deletions(-)
lib
compiler
lib/compiler/Maker.zig+2-2
| ... | @@ -1400,7 +1400,7 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { | ... | @@ -1400,7 +1400,7 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 1400 | 1400 | ||
| 1401 | if (config_man) |man| { | 1401 | if (config_man) |man| { |
| 1402 | if (.hit == try man.check(compile_prog_node)) { | 1402 | if (.hit == try man.check(compile_prog_node)) { |
| 1403 | const digest = man.final(); | 1403 | const digest = man.hitDigestHex(); |
| 1404 | const path: Path = .{ | 1404 | const path: Path = .{ |
| 1405 | .root_dir = graph.local_cache_root, | 1405 | .root_dir = graph.local_cache_root, |
| 1406 | .sub_path = try arena.print("c/{s}", .{&digest}), | 1406 | .sub_path = try arena.print("c/{s}", .{&digest}), |
| ... | @@ -1512,7 +1512,7 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { | ... | @@ -1512,7 +1512,7 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 1512 | break :cp .{ config_tmp_path, null }; | 1512 | break :cp .{ config_tmp_path, null }; |
| 1513 | } else { | 1513 | } else { |
| 1514 | const man = config_man.?; | 1514 | const man = config_man.?; |
| 1515 | const digest = man.final(); | 1515 | const digest = man.missDigestHex(); |
| 1516 | const final_path: Path = .{ | 1516 | const final_path: Path = .{ |
| 1517 | .root_dir = graph.local_cache_root, | 1517 | .root_dir = graph.local_cache_root, |
| 1518 | .sub_path = try arena.print("c/{s}", .{&digest}), | 1518 | .sub_path = try arena.print("c/{s}", .{&digest}), |
lib/compiler/Maker/Step/ConfigHeader.zig+2-2
| ... | @@ -137,7 +137,7 @@ pub fn make( | ... | @@ -137,7 +137,7 @@ pub fn make( |
| 137 | man.hash.addBytes(output); | 137 | man.hash.addBytes(output); |
| 138 | 138 | ||
| 139 | if (try step.cacheHit(maker, &man, progress_node)) { | 139 | if (try step.cacheHit(maker, &man, progress_node)) { |
| 140 | const digest = man.final(); | 140 | const digest = man.hitDigestHex(); |
| 141 | maker.generatedPath(conf_ch.generated_dir).* = .{ | 141 | maker.generatedPath(conf_ch.generated_dir).* = .{ |
| 142 | .root_dir = cache_root, | 142 | .root_dir = cache_root, |
| 143 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest }), | 143 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest }), |
| ... | @@ -145,7 +145,7 @@ pub fn make( | ... | @@ -145,7 +145,7 @@ pub fn make( |
| 145 | return; | 145 | return; |
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | const digest = man.final(); | 148 | const digest = man.missDigestHex(); |
| 149 | 149 | ||
| 150 | // If output_path has directory parts, deal with them. Example: | 150 | // If output_path has directory parts, deal with them. Example: |
| 151 | // output_dir is zig-cache/o/HASH | 151 | // output_dir is zig-cache/o/HASH |
lib/compiler/Maker/Step/ObjCopy.zig+2-2
| ... | @@ -48,7 +48,7 @@ pub fn make( | ... | @@ -48,7 +48,7 @@ pub fn make( |
| 48 | 48 | ||
| 49 | if (try step.cacheHit(maker, &man, progress_node)) { | 49 | if (try step.cacheHit(maker, &man, progress_node)) { |
| 50 | // Cache hit, skip subprocess execution. | 50 | // Cache hit, skip subprocess execution. |
| 51 | const digest = man.final(); | 51 | const digest = man.hitDigestHex(); |
| 52 | maker.generatedPath(conf_oc.output_file).* = .{ | 52 | maker.generatedPath(conf_oc.output_file).* = .{ |
| 53 | .root_dir = cache_root, | 53 | .root_dir = cache_root, |
| 54 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), | 54 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), |
| ... | @@ -67,7 +67,7 @@ pub fn make( | ... | @@ -67,7 +67,7 @@ pub fn make( |
| 67 | 67 | ||
| 68 | // We don't find out more input files while executing objcopy so we can | 68 | // We don't find out more input files while executing objcopy so we can |
| 69 | // already obtain the digest and use it directly as the output path. | 69 | // already obtain the digest and use it directly as the output path. |
| 70 | const digest = man.final(); | 70 | const digest = man.missDigestHex(); |
| 71 | const dest_path: Path = .{ | 71 | const dest_path: Path = .{ |
| 72 | .root_dir = cache_root, | 72 | .root_dir = cache_root, |
| 73 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), | 73 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), |
lib/compiler/Maker/Step/Options.zig+2-2
| ... | @@ -54,7 +54,7 @@ pub fn make( | ... | @@ -54,7 +54,7 @@ pub fn make( |
| 54 | const basename = "options.zig"; | 54 | const basename = "options.zig"; |
| 55 | 55 | ||
| 56 | if (try step.cacheHitWatched(maker, &man, progress_node)) { | 56 | if (try step.cacheHitWatched(maker, &man, progress_node)) { |
| 57 | const digest = man.final(); | 57 | const digest = man.hitDigestHex(); |
| 58 | maker.generatedPath(conf_options.generated_file).* = .{ | 58 | maker.generatedPath(conf_options.generated_file).* = .{ |
| 59 | .root_dir = cache_root, | 59 | .root_dir = cache_root, |
| 60 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), | 60 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), |
| ... | @@ -63,7 +63,7 @@ pub fn make( | ... | @@ -63,7 +63,7 @@ pub fn make( |
| 63 | return; | 63 | return; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | const digest = man.final(); | 66 | const digest = man.missDigestHex(); |
| 67 | const out_path: Cache.Path = .{ | 67 | const out_path: Cache.Path = .{ |
| 68 | .root_dir = cache_root, | 68 | .root_dir = cache_root, |
| 69 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), | 69 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest, basename }), |
lib/compiler/Maker/Step/Run.zig+3-3
| ... | @@ -261,7 +261,7 @@ pub fn make( | ... | @@ -261,7 +261,7 @@ pub fn make( |
| 261 | 261 | ||
| 262 | if (!has_side_effects and try step.cacheHitWatched(maker, &man, progress_node)) { | 262 | if (!has_side_effects and try step.cacheHitWatched(maker, &man, progress_node)) { |
| 263 | // Cache hit; skip running command. | 263 | // Cache hit; skip running command. |
| 264 | const digest = man.final(); | 264 | const digest = man.hitDigestHex(); |
| 265 | try populateGeneratedStdIo(maker, &conf_run, cache_root, &digest); | 265 | try populateGeneratedStdIo(maker, &conf_run, cache_root, &digest); |
| 266 | try populateGeneratedPaths(maker, output_placeholders.items, cache_root, &digest); | 266 | try populateGeneratedPaths(maker, output_placeholders.items, cache_root, &digest); |
| 267 | step.result_cached = true; | 267 | step.result_cached = true; |
| ... | @@ -270,7 +270,7 @@ pub fn make( | ... | @@ -270,7 +270,7 @@ pub fn make( |
| 270 | 270 | ||
| 271 | if (!any_dep_files) { | 271 | if (!any_dep_files) { |
| 272 | // We already know the final output paths; use them directly. | 272 | // We already know the final output paths; use them directly. |
| 273 | const digest = if (has_side_effects) man.hash.final() else man.final(); | 273 | const digest = if (has_side_effects) man.hash.final() else man.missDigestHex(); |
| 274 | const output_dir_path = "o" ++ Dir.path.sep_str ++ &digest; | 274 | const output_dir_path = "o" ++ Dir.path.sep_str ++ &digest; |
| 275 | try populateGeneratedStdIo(maker, &conf_run, cache_root, &digest); | 275 | try populateGeneratedStdIo(maker, &conf_run, cache_root, &digest); |
| 276 | try populateGeneratedPathsCreateDirs(arena, run_index, maker, output_dir_path, output_placeholders.items, argv_list.items); | 276 | try populateGeneratedPathsCreateDirs(arena, run_index, maker, output_dir_path, output_placeholders.items, argv_list.items); |
| ... | @@ -308,7 +308,7 @@ pub fn make( | ... | @@ -308,7 +308,7 @@ pub fn make( |
| 308 | } | 308 | } |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | const digest = if (has_side_effects) man.hash.final() else man.final(); | 311 | const digest = if (has_side_effects) man.hash.final() else man.missDigestHex(); |
| 312 | 312 | ||
| 313 | const any_output = output_placeholders.items.len > 0 or | 313 | const any_output = output_placeholders.items.len > 0 or |
| 314 | conf_run.captured_stdout.value != null or conf_run.captured_stderr.value != null; | 314 | conf_run.captured_stdout.value != null or conf_run.captured_stderr.value != null; |
lib/compiler/Maker/Step/WriteFile.zig+2-2
| ... | @@ -105,7 +105,7 @@ pub fn make( | ... | @@ -105,7 +105,7 @@ pub fn make( |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | if (try step.cacheHit(maker, &man, progress_node)) { | 107 | if (try step.cacheHit(maker, &man, progress_node)) { |
| 108 | const digest = man.final(); | 108 | const digest = man.hitDigestHex(); |
| 109 | maker.generatedPath(conf_wf.generated_directory).* = .{ | 109 | maker.generatedPath(conf_wf.generated_directory).* = .{ |
| 110 | .root_dir = cache_root, | 110 | .root_dir = cache_root, |
| 111 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest }), | 111 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest }), |
| ... | @@ -114,7 +114,7 @@ pub fn make( | ... | @@ -114,7 +114,7 @@ pub fn make( |
| 114 | return; | 114 | return; |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | const digest = man.final(); | 117 | const digest = man.missDigestHex(); |
| 118 | const out_path: Path = .{ | 118 | const out_path: Path = .{ |
| 119 | .root_dir = cache_root, | 119 | .root_dir = cache_root, |
| 120 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest }), | 120 | .sub_path = try Io.Dir.path.join(arena, &.{ "o", &digest }), |