Merge pull request #3400 from burner/logger_less_code_better_debugging

logger cleanup2:
dlang · Jun 12, 2015 · b02ea54 · b02ea54
2 parents fd95fa7 + eb9b3b1
commit b02ea54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/std/experimental/logger/core.d b/std/experimental/logger/core.d
@@ -1804,16 +1804,6 @@ unittest
     stdThreadLocalLog = l;
 }
 
-@trusted package string randomString(size_t upto)
-{
-    import std.ascii : letters;
-    import std.random : uniform;
-    auto app = Appender!string();
-    foreach (_ ; 0 .. upto)
-        app.put(letters[uniform(0, letters.length)]);
-    return app.data;
-}
-
 @safe unittest
 {
     LogLevel ll = globalLogLevel;
@@ -2083,7 +2073,8 @@ version(unittest) private void testFuncNames(Logger logger) @safe
 unittest // default logger
 {
     import std.file : exists, remove;
-    string filename = randomString(32) ~ ".tempLogFile";
+
+    string filename = __FUNCTION__ ~ ".tempLogFile";
     FileLogger l = new FileLogger(filename);
     auto oldunspecificLogger = sharedLog;
     sharedLog = l;
@@ -2121,7 +2112,7 @@ unittest
 {
     import std.file : remove;
     import core.memory : destroy;
-    string filename = randomString(32) ~ ".tempLogFile";
+    string filename = __FUNCTION__ ~ ".tempLogFile";
     auto oldunspecificLogger = sharedLog;
 
     scope(exit)

diff --git a/std/experimental/logger/filelogger.d b/std/experimental/logger/filelogger.d
@@ -135,7 +135,7 @@ unittest
     import std.array : empty;
     import std.string : indexOf;
 
-    string filename = randomString(32) ~ ".tempLogFile";
+    string filename = __FUNCTION__ ~ ".tempLogFile";
     auto l = new FileLogger(filename);
 
     scope(exit)
@@ -164,7 +164,7 @@ unittest
     import std.array : empty;
     import std.string : indexOf;
 
-    string filename = randomString(32) ~ ".tempLogFile";
+    string filename = __FUNCTION__ ~ ".tempLogFile";
     auto file = File(filename, "w");
     auto l = new FileLogger(file);
 

diff --git a/std/experimental/logger/multilogger.d b/std/experimental/logger/multilogger.d
@@ -143,7 +143,7 @@ unittest
 {
     import std.stdio : File;
     import std.string : indexOf;
-    auto logName = randomString(32) ~ ".log";
+    string logName = __FUNCTION__ ~ ".log";
     auto logFileOutput = File(logName, "w");
     scope(exit)
     {