From a6628cf1f529c85a4f2e561bd056764d4dcb58b4 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Fri, 11 Mar 2022 18:48:53 -0800
Subject: [PATCH] DepType- GitVersion -> Version.Git

---
 src/common.zig        |  2 +-
 src/util/dep.zig      |  2 +-
 src/util/dep_type.zig | 31 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/common.zig b/src/common.zig
index eebdf3a0b2f3f20c7ca8f99d673ca7ec4cf6ac09..f572d409c387b9971bb2ec4b49e63e13cfd3a574 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -134,7 +134,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !
         },
         .git => {
             if (d.version.len > 0) {
-                const vers = u.parse_split(zigmod.DepType.GitVersion, "-").do(d.version) catch |e| switch (e) {
+                const vers = u.parse_split(zigmod.DepType.Version.Git, "-").do(d.version) catch |e| switch (e) {
                     error.IterEmpty => unreachable,
                     error.NoMemberFound => {
                         const vtype = d.version[0..std.mem.indexOf(u8, d.version, "-").?];
diff --git a/src/util/dep.zig b/src/util/dep.zig
index a7455997306c3bcd0f0098e54c5ad6f9d5c21a1d..d53b47609f69f7275056507c5aac44aac0f17143 100644
--- a/src/util/dep.zig
+++ b/src/util/dep.zig
@@ -67,7 +67,7 @@ pub const Dep = struct {
         }
         return switch (self.type) {
             .git => blk: {
-                const vers = try u.parse_split(zigmod.DepType.GitVersion, "-").do(self.version);
+                const vers = try u.parse_split(zigmod.DepType.Version.Git, "-").do(self.version);
                 if (vers.id.frozen()) break :blk self.version;
                 break :blk try self.type.exact_version(alloc, dpath);
             },
diff --git a/src/util/dep_type.zig b/src/util/dep_type.zig
index 47ada2e55dfbf11f38348a4106bf0a1d7d79b31f..865b826028abbcb6175d6a050892da786115389a 100644
--- a/src/util/dep_type.zig
+++ b/src/util/dep_type.zig
@@ -85,17 +85,26 @@ pub const DepType = enum {
         };
     }
 
-    pub const GitVersion = enum {
-        branch,
-        tag,
-        commit,
+    pub const Version = union(DepType) {
+        local: void,
+        system_lib: void,
+        framework: void,
+        git: Git,
+        hg: void,
+        http: void,
 
-        pub fn frozen(self: GitVersion) bool {
-            return switch (self) {
-                .branch => false,
-                .tag => true,
-                .commit => true,
-            };
-        }
+        pub const Git = enum {
+            branch,
+            tag,
+            commit,
+
+            pub fn frozen(self: Git) bool {
+                return switch (self) {
+                    .branch => false,
+                    .tag => true,
+                    .commit => true,
+                };
+            }
+        };
     };
 };
-- 
2.54.0