From 2afeafd838973023810adaff0992a3cdb5d9fe3e Mon Sep 17 00:00:00 2001 From: Mathias Lang Date: Tue, 19 Dec 2023 12:46:33 +0100 Subject: [PATCH] Trivial: Inline unused listDirectory into iterateDirectory In practice we only every iterate directories in a foreach, which means iterateDirectory is the only function ever used. --- source/dub/internal/vibecompat/core/file.d | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/source/dub/internal/vibecompat/core/file.d b/source/dub/internal/vibecompat/core/file.d index 7d5779fe4..64faf3b34 100644 --- a/source/dub/internal/vibecompat/core/file.d +++ b/source/dub/internal/vibecompat/core/file.d @@ -253,23 +253,15 @@ void ensureDirectory(NativePath path) /** Enumerates all files in the specified directory. */ -void listDirectory(NativePath path, scope bool delegate(FileInfo info) del) -{ - foreach( DirEntry ent; dirEntries(path.toNativeString(), SpanMode.shallow) ) - if( !del(makeFileInfo(ent)) ) - break; -} - -/// ditto int delegate(scope int delegate(ref FileInfo)) iterateDirectory(NativePath path) { int iterator(scope int delegate(ref FileInfo) del){ - int ret = 0; - listDirectory(path, (fi){ - ret = del(fi); - return ret == 0; - }); - return ret; + foreach (DirEntry ent; dirEntries(path.toNativeString(), SpanMode.shallow)) { + auto fi = makeFileInfo(ent); + if (auto res = del(fi)) + return res; + } + return 0; } return &iterator; }