diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-10-08 17:29:55 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2023-10-08 17:29:55 -0700 |
| commit | 6d84caf72771cf05997518ae2fa40a94de709de4 (patch) | |
| tree | 862543ae6537595ef67ced8d4d06da5384f29699 | |
| parent | 7bae6d90648e6ef0782c7f5e8a72066742feacaf (diff) | |
| download | zig-6d84caf72771cf05997518ae2fa40a94de709de4.tar.gz zig-6d84caf72771cf05997518ae2fa40a94de709de4.zip | |
move some package management related source files around
| -rw-r--r-- | src/Package.zig | 2 | ||||
| -rw-r--r-- | src/Package/Fetch.zig | 4 | ||||
| -rw-r--r-- | src/Package/Fetch/git.zig (renamed from src/git.zig) | 2 | ||||
| -rw-r--r-- | src/Package/Fetch/git/testdata/testrepo.idx (renamed from src/git/testdata/testrepo.idx) | bin | 3480 -> 3480 bytes | |||
| -rw-r--r-- | src/Package/Fetch/git/testdata/testrepo.pack (renamed from src/git/testdata/testrepo.pack) | bin | 6511 -> 6511 bytes | |||
| -rw-r--r-- | src/Package/Manifest.zig (renamed from src/Manifest.zig) | 0 |
6 files changed, 3 insertions, 5 deletions
diff --git a/src/Package.zig b/src/Package.zig index 32533b2d04..c36830d599 100644 --- a/src/Package.zig +++ b/src/Package.zig @@ -1,7 +1,7 @@ pub const Module = @import("Package/Module.zig"); pub const Fetch = @import("Package/Fetch.zig"); pub const build_zig_basename = "build.zig"; -pub const Manifest = @import("Manifest.zig"); +pub const Manifest = @import("Package/Manifest.zig"); pub const Path = struct { root_dir: Cache.Directory, diff --git a/src/Package/Fetch.zig b/src/Package/Fetch.zig index b57117ce97..373ab5be78 100644 --- a/src/Package/Fetch.zig +++ b/src/Package/Fetch.zig @@ -1449,9 +1449,9 @@ const Allocator = std.mem.Allocator; const Cache = std.Build.Cache; const ThreadPool = std.Thread.Pool; const WaitGroup = std.Thread.WaitGroup; -const Manifest = @import("../Manifest.zig"); const Fetch = @This(); const main = @import("../main.zig"); -const git = @import("../git.zig"); +const git = @import("Fetch/git.zig"); const Package = @import("../Package.zig"); +const Manifest = Package.Manifest; const ErrorBundle = std.zig.ErrorBundle; diff --git a/src/git.zig b/src/Package/Fetch/git.zig index fd35c5c33e..af4317702d 100644 --- a/src/git.zig +++ b/src/Package/Fetch/git.zig @@ -11,8 +11,6 @@ const Allocator = mem.Allocator; const Sha1 = std.crypto.hash.Sha1; const assert = std.debug.assert; -const ProgressReader = @import("Package.zig").ProgressReader; - pub const oid_length = Sha1.digest_length; pub const fmt_oid_length = 2 * oid_length; /// The ID of a Git object (an SHA-1 hash). diff --git a/src/git/testdata/testrepo.idx b/src/Package/Fetch/git/testdata/testrepo.idx Binary files differindex fdaba5ed48..fdaba5ed48 100644 --- a/src/git/testdata/testrepo.idx +++ b/src/Package/Fetch/git/testdata/testrepo.idx diff --git a/src/git/testdata/testrepo.pack b/src/Package/Fetch/git/testdata/testrepo.pack Binary files differindex 1b2f5dd650..1b2f5dd650 100644 --- a/src/git/testdata/testrepo.pack +++ b/src/Package/Fetch/git/testdata/testrepo.pack diff --git a/src/Manifest.zig b/src/Package/Manifest.zig index 7fce7c8bcb..7fce7c8bcb 100644 --- a/src/Manifest.zig +++ b/src/Package/Manifest.zig |