From cdbcca208bb393e6e92247272c402f7df46fb737 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Thu, 6 May 2021 03:10:11 -0700
Subject: [PATCH] util: remove u.rm_recv

---
 src/common.zig     |  4 ++--
 src/util/funcs.zig | 22 ----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/common.zig b/src/common.zig
index ac836f65b86b32113bb8c47b616f1f9728bc55a1..a5c6202fbe829caef2ecc8d2a0e4763e0a1ee384 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -144,12 +144,12 @@ fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, comptime o
                     try std.fs.cwd().deleteFile(file_path);
                     return pv;
                 }
-                try u.rm_recv(pv);
+                try std.fs.cwd().deleteTree(pv);
                 u.assert(false, "{s} does not match hash {s}", .{ d.path, d.version });
                 return p;
             }
             if (try u.does_folder_exist(p)) {
-                try u.rm_recv(p);
+                try std.fs.cwd().deleteTree(p);
             }
             const file_path = try std.fs.path.join(gpa, &.{ p, file_name });
             try d.type.pull(d.path, p);
diff --git a/src/util/funcs.zig b/src/util/funcs.zig
index 42dcc03ce2ca6eea0caa8bb98b959bbe6691b509..6c143e3adc4d322fec1300bf6ee71bae0df95023 100644
--- a/src/util/funcs.zig
+++ b/src/util/funcs.zig
@@ -186,28 +186,6 @@ pub fn last(in: [][]const u8) ![]const u8 {
     return in[in.len - 1];
 }
 
-pub fn rm_recv(path: []const u8) anyerror!void {
-    const abs_path = std.fs.realpathAlloc(gpa, path) catch |e| switch (e) {
-        error.FileNotFound => return,
-        else => return e,
-    };
-    const file = try std.fs.openFileAbsolute(abs_path, .{});
-    defer file.close();
-    const s = try file.stat();
-    if (s.kind == .Directory) {
-        const dir = std.fs.cwd().openDir(abs_path, .{
-            .iterate = true,
-        }) catch unreachable;
-        var iter = dir.iterate();
-        while (try iter.next()) |item| {
-            try rm_recv(try std.fs.path.join(gpa, &.{ abs_path, item.name }));
-        }
-        try std.fs.deleteDirAbsolute(abs_path);
-    } else {
-        try std.fs.deleteFileAbsolute(abs_path);
-    }
-}
-
 const alphabet = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 pub fn random_string(len: usize) ![]const u8 {
-- 
2.54.0