From fa52c3f709ecb5945e5b8f86958be87a528ac289 Mon Sep 17 00:00:00 2001
From: RazvanN7 <razvan.nitu1305@gmail.com>
Date: Tue, 23 Jan 2018 10:02:08 +0200
Subject: [PATCH] Fix erroneous imports in unittests

---
 std/experimental/logger/nulllogger.d | 3 +--
 std/file.d                           | 5 +++--
 std/range/package.d                  | 1 -
 std/socket.d                         | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/std/experimental/logger/nulllogger.d b/std/experimental/logger/nulllogger.d
index 8d3e9ad5f00..f4e83c5ca93 100644
--- a/std/experimental/logger/nulllogger.d
+++ b/std/experimental/logger/nulllogger.d
@@ -34,8 +34,7 @@ class NullLogger : Logger
 ///
 @safe unittest
 {
-    import std.experimental.logger.nulllogger : LogLevel;
-
+    import std.experimental.logger.core : LogLevel;
     auto nl1 = new NullLogger(LogLevel.all);
     nl1.info("You will never read this.");
     nl1.fatal("You will never read this, either and it will not throw");
diff --git a/std/file.d b/std/file.d
index f063a8e4582..2953453d148 100644
--- a/std/file.d
+++ b/std/file.d
@@ -2291,7 +2291,7 @@ if (isConvertibleToString!R)
 
 @safe unittest
 {
-    import std.path : mkdir;
+    import std.file : mkdir;
     static assert(__traits(compiles, mkdir(TestAliasedString(null))));
 }
 
@@ -4073,7 +4073,8 @@ auto dirEntries(string path, SpanMode mode, bool followSymlink = true)
     import std.algorithm.searching : startsWith;
     import std.array : array;
     import std.conv : to;
-    import std.path : dirEntries, buildPath, absolutePath;
+    import std.path : buildPath, absolutePath;
+    import std.file : dirEntries;
     import std.process : thisProcessID;
     import std.range.primitives : walkLength;
 
diff --git a/std/range/package.d b/std/range/package.d
index eefc129d772..e930e16dc75 100644
--- a/std/range/package.d
+++ b/std/range/package.d
@@ -11650,7 +11650,6 @@ if (isInputRange!R && isIntegral!(ElementType!R))
         bw.popFront();
         assert(bw[2 * bitsNum - 3] == true);
 
-        import core.exception : Error;
         import std.exception : assertThrown;
 
         // Check out of bounds error
diff --git a/std/socket.d b/std/socket.d
index 361ec73daa3..a0bcc5d560b 100644
--- a/std/socket.d
+++ b/std/socket.d
@@ -85,10 +85,10 @@ else version(Posix)
         }
     }
 
+    public import core.sys.posix.netinet.in_;
     import core.sys.posix.arpa.inet;
     import core.sys.posix.fcntl;
     import core.sys.posix.netdb;
-    import core.sys.posix.netinet.in_;
     import core.sys.posix.netinet.tcp;
     import core.sys.posix.sys.select;
     import core.sys.posix.sys.socket;