1 files changed, 15 insertions, 28 deletions
diff --git a/tests/link/driver.cxx b/tests/link/driver.cxx
index 231da4b..b659838 100644
--- a/tests/link/driver.cxx
+++ b/tests/link/driver.cxx
@@ -1,34 +1,19 @@
 // file      : tests/link/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
-#ifndef __cpp_lib_modules_ts
 #include <set>
 #include <utility>      // pair
 #include <iostream>     // cerr
 #include <system_error>
-#endif
 
-// Other includes.
+#include <libbutl/path.hxx>
+#include <libbutl/path-io.hxx>
+#include <libbutl/utility.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
 
-#ifdef __cpp_modules_ts
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-import butl.path;
-import butl.path_io;
-import butl.utility;
-import butl.fdstream;
-import butl.filesystem;
-#else
-#include <libbutl/path.mxx>
-#include <libbutl/path-io.mxx>
-#include <libbutl/utility.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/filesystem.mxx>
-#endif
+#undef NDEBUG
+#include <cassert>
 
 using namespace std;
 using namespace butl;
@@ -122,11 +107,11 @@ link_dir (const dir_path& target,
   dir_path tp (target.absolute () ? target : link.directory () / target);
 
   set<pair<entry_type, path>> te;
-  for (const dir_entry& de: dir_iterator (tp, false /* ignore_dangling */))
+  for (const dir_entry& de: dir_iterator (tp, dir_iterator::no_follow))
     te.emplace (de.ltype (), de.path ());
 
   set<pair<entry_type, path>> le;
-  for (const dir_entry& de: dir_iterator (link, false /* ignore_dangling */))
+  for (const dir_entry& de: dir_iterator (link, dir_iterator::no_follow))
     le.emplace (de.ltype (), de.path ());
 
   return te == le;
@@ -321,7 +306,7 @@ main (int argc, const char* argv[])
     assert (pe.first && pe.second.type == entry_type::directory);
   }
 
-  for (const dir_entry& de: dir_iterator (td, false /* ignore_dangling */))
+  for (const dir_entry& de: dir_iterator (td, dir_iterator::no_follow))
   {
     assert (de.path () != path ("dslink") ||
             (de.type () == entry_type::directory &&
@@ -383,7 +368,9 @@ main (int argc, const char* argv[])
   {
     mksymlink (dp / "non-existing", dp / "lnk");
     assert (!dir_empty (dp));
-    assert (dir_iterator (dp, true /* ignore_dangling */) == dir_iterator ());
+
+    assert (dir_iterator (dp, dir_iterator::ignore_dangling) ==
+            dir_iterator ());
   }
   catch (const system_error& e)
   {
@@ -408,10 +395,10 @@ main (int argc, const char* argv[])
 
   mksymlink  (dp / "non-existing", dp / "lnk1", true /* dir */);
   assert (!dir_empty (dp));
-  assert (dir_iterator (dp, true /* ignore_dangling */) == dir_iterator ());
+  assert (dir_iterator (dp, dir_iterator::ignore_dangling) == dir_iterator ());
 
   mksymlink  (tgd, dp / "lnk2", true /* dir */);
-  assert (dir_iterator (dp, true /* ignore_dangling */) != dir_iterator ());
+  assert (dir_iterator (dp, dir_iterator::ignore_dangling) != dir_iterator ());
 
   rmdir_r (dp);
   assert (dir_exists (tgd));