Cache #7631
Cache #7631
Conversation
src/cache.zig
Outdated
|
|
||
| pub const RocCacheFile = union(RocCacheFileTag) { | ||
| compiler: CompilerCacheFile, | ||
| build: void, |
There was a problem hiding this comment.
- if you want to make a tagged union and don't need the enum by itself, you can just write
union(enum)and it'll create the enum for you - if a tagged union variant doesn't have a payload, you don't need to put void, you can just do
build,instead ofbuild: void,
src/cache.zig
Outdated
| return default_cache_folder; | ||
| }, | ||
| else => { | ||
| // SKILL_ISSUE: I want to include the os name in the error message, but |
There was a problem hiding this comment.
You're looking for comptimePrint
There was a problem hiding this comment.
I got the ++ operator to work. I can't remember what I was doing wrong...
src/cache.zig
Outdated
| return try getBaseRocCacheFolder(allocator, xdg_cache_home, sub_path); | ||
| } | ||
|
|
||
| fn getXdgCacheHome(allocator: Allocator) ?[]u8 { |
There was a problem hiding this comment.
On Unix, this should be used first when looking for the cache root, then $HOME/.cache/roc after that
There was a problem hiding this comment.
I made this a separate function because I didn't want the tests to break because someone set XDG_CACHE_HOME. I wanted to mock it out, but it's probably making the code too confusing so I'll refactor.
I'm sure we can figure out something better to solve the problem.
src/cache.zig
Outdated
| const roc_cache_folder = std.fs.path.dirname(file_cache_path); | ||
| if (roc_cache_folder) |x| { | ||
| cwd.makePath(x) catch { | ||
| return SaveCacheFileError.FailedToMakeCacheFolder; |
There was a problem hiding this comment.
very minor nitpick: I think generally Zig uses error.NameOfError when creating an error variant from a custom error union.
There was a problem hiding this comment.
I added it so that I can pass a callback function for saving to the file system in saveToCacheInternal. I wanted to add the callback so that I can mock it out during testing.
src/cache.zig
Outdated
| packages_build, | ||
| }; | ||
|
|
||
| pub const RocCacheFile = union(RocCacheFileTag) { |
There was a problem hiding this comment.
Two naming things:
- Roc is implied throughout this whole compiler, so no need to prefix names with it except in cases of ambiguity
- Zig prefers to nest related "has-a" data like the above
CompilerCacheFile: https://ziggit.dev/t/nesting-struct-types-or-not/6750
An example of how I might nest it would be:
pub const CacheFile = union(enum) {
compiler: Compiler,
build,
packages_src,
packages_build,
pub const Compiler = struct {
version_name: []const u8,
binary: []const u8,
};
};
|
@jfkonecn can you interactive rebase to either squash the commits or at least give them minorly meaningful names? A bunch of commits just with the name |
|
Yeah, I was going to do that when I'm ready for an official review, but if you prefer I do that now I can do that as well. |
Doesn't matter when. Just was noting in general. |
|
@smores56 this is a nitpick, but for |
closes #7517
Still as work in progress