diff --git a/druntime/src/test_runner.d b/druntime/src/test_runner.d index 207589ea96..8accf81940 100644 --- a/druntime/src/test_runner.d +++ b/druntime/src/test_runner.d @@ -1,5 +1,5 @@ import core.runtime, core.time : MonoTime; -import core.stdc.stdio; +import core.stdc.stdio : printf; version (ARM) version = ARM_Any; version (AArch64) version = ARM_Any; diff --git a/druntime/test/aa/src/test_aa.d b/druntime/test/aa/src/test_aa.d index 11ad2f90ff..5ccb14be17 100644 --- a/druntime/test/aa/src/test_aa.d +++ b/druntime/test/aa/src/test_aa.d @@ -585,8 +585,6 @@ void issue13078() nothrow pure void issue14104() { - import core.stdc.stdio; - alias K = const(ubyte)*; size_t[K] aa; immutable key = cast(K)(cast(size_t) uint.max + 1); diff --git a/druntime/test/betterc/src/test19933.d b/druntime/test/betterc/src/test19933.d index a0faadd211..d5c9eacf0d 100644 --- a/druntime/test/betterc/src/test19933.d +++ b/druntime/test/betterc/src/test19933.d @@ -2,7 +2,7 @@ // https://issues.dlang.org/show_bug.cgi?id=19933 // https://issues.dlang.org/show_bug.cgi?id=18816 -import core.stdc.stdio; +import core.stdc.stdio : fprintf, stderr; extern(C) int main() { diff --git a/druntime/test/config/src/test22523.d b/druntime/test/config/src/test22523.d index f3086963f2..680f573ce7 100644 --- a/druntime/test/config/src/test22523.d +++ b/druntime/test/config/src/test22523.d @@ -1,6 +1,6 @@ // https://issues.dlang.org/show_bug.cgi?id=22523 -import core.stdc.stdio; +import core.stdc.stdio : puts; int main() { diff --git a/druntime/test/cpuid/src/cpuid.d b/druntime/test/cpuid/src/cpuid.d index ef1e124e9e..2f02295227 100644 --- a/druntime/test/cpuid/src/cpuid.d +++ b/druntime/test/cpuid/src/cpuid.d @@ -1,6 +1,6 @@ module puid; import core.cpuid; -import core.stdc.stdio; +import core.stdc.stdio : printf; mixin template printFlag(string name) { diff --git a/druntime/test/exceptions/src/chain.d b/druntime/test/exceptions/src/chain.d index 0305707fc6..d860ff072e 100644 --- a/druntime/test/exceptions/src/chain.d +++ b/druntime/test/exceptions/src/chain.d @@ -1,7 +1,7 @@ // Author: Ali Çehreli // See https://forum.dlang.org/post/o2n7f8$2p1t$1@digitalmars.com -import core.stdc.stdio; +import core.stdc.stdio : printf; class TestException : Exception { diff --git a/druntime/test/exceptions/src/future_message.d b/druntime/test/exceptions/src/future_message.d index f81df7334c..c42cde5026 100644 --- a/druntime/test/exceptions/src/future_message.d +++ b/druntime/test/exceptions/src/future_message.d @@ -1,4 +1,4 @@ -import core.stdc.stdio; +import core.stdc.stdio : fprintf, stderr; // Make sure basic stuff works with future Throwable.message class NoMessage : Throwable diff --git a/druntime/test/exceptions/src/line_trace.d b/druntime/test/exceptions/src/line_trace.d index 0f36396524..635731091c 100644 --- a/druntime/test/exceptions/src/line_trace.d +++ b/druntime/test/exceptions/src/line_trace.d @@ -6,7 +6,7 @@ void main() } catch (Exception e) { - import core.stdc.stdio; + import core.stdc.stdio : printf; auto str = e.toString(); printf("%.*s\n", cast(int)str.length, str.ptr); } diff --git a/druntime/test/exceptions/src/long_backtrace_trunc.d b/druntime/test/exceptions/src/long_backtrace_trunc.d index 3ff45e55c8..384bb2a738 100644 --- a/druntime/test/exceptions/src/long_backtrace_trunc.d +++ b/druntime/test/exceptions/src/long_backtrace_trunc.d @@ -30,7 +30,7 @@ void main() { HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH x; x.tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt(1); } catch (Exception e) { - import core.stdc.stdio; + import core.stdc.stdio : printf; auto str = e.toString(); printf("%.*s\n", cast(int)str.length, str.ptr); } diff --git a/druntime/test/exceptions/src/static_dtor.d b/druntime/test/exceptions/src/static_dtor.d index 71c8368727..1d5520110d 100644 --- a/druntime/test/exceptions/src/static_dtor.d +++ b/druntime/test/exceptions/src/static_dtor.d @@ -1,5 +1,5 @@ // https://issues.dlang.org/show_bug.cgi?id=16594 -import core.stdc.stdio; +import core.stdc.stdio : fprintf, stderr; shared static ~this() { diff --git a/druntime/test/gc/forkgc.d b/druntime/test/gc/forkgc.d index 9c18dc296f..f85d9f186b 100644 --- a/druntime/test/gc/forkgc.d +++ b/druntime/test/gc/forkgc.d @@ -1,5 +1,5 @@ import core.memory; -import core.stdc.stdio; +import core.stdc.stdio : printf; import core.sys.posix.sys.wait; import core.sys.posix.unistd; diff --git a/druntime/test/gc/hospital.d b/druntime/test/gc/hospital.d index 7a56c214d2..093cd06287 100644 --- a/druntime/test/gc/hospital.d +++ b/druntime/test/gc/hospital.d @@ -24,7 +24,7 @@ int main(string[] args) version (VERBOSE) { - import core.stdc.stdio; + import core.stdc.stdio : printf; printf("Patients: %lld\n", t.patients); printf("Time: %lld\n", t.hospitalTime); printf("Visits: %lld\n", t.hospitalVisits); diff --git a/druntime/test/gc/precisegc.d b/druntime/test/gc/precisegc.d index 9bcaf3f4fa..c22dbdb14e 100644 --- a/druntime/test/gc/precisegc.d +++ b/druntime/test/gc/precisegc.d @@ -7,7 +7,7 @@ module testgc; import core.memory; -import core.stdc.stdio; +import core.stdc.stdio : printf; class C { diff --git a/druntime/test/gc/recoverfree.d b/druntime/test/gc/recoverfree.d index 59c3b4ab59..e5273a7e5b 100644 --- a/druntime/test/gc/recoverfree.d +++ b/druntime/test/gc/recoverfree.d @@ -1,5 +1,4 @@ // https://issues.dlang.org/show_bug.cgi?id=20438 -import core.stdc.stdio; import core.memory; void main() diff --git a/druntime/test/hash/src/test_hash.d b/druntime/test/hash/src/test_hash.d index 9b1f9e41d9..47ac6612e7 100644 --- a/druntime/test/hash/src/test_hash.d +++ b/druntime/test/hash/src/test_hash.d @@ -169,7 +169,7 @@ void issue19568() ~this() @nogc nothrow { - import core.stdc.stdio; + import core.stdc.stdio : puts; if (mptr) puts("impure"); } @@ -183,7 +183,7 @@ void issue19568() ~this() @nogc nothrow { - import core.stdc.stdio; + import core.stdc.stdio : puts; if (fd != -1) puts("impure"); } diff --git a/druntime/test/importc_compare/src/importc_compare.d b/druntime/test/importc_compare/src/importc_compare.d index 51d0a75b74..543895874e 100644 --- a/druntime/test/importc_compare/src/importc_compare.d +++ b/druntime/test/importc_compare/src/importc_compare.d @@ -1,4 +1,4 @@ -import core.stdc.stdio; +import core.stdc.stdio : printf; version (OSX) version = Apple; diff --git a/druntime/test/init_fini/src/custom_gc.d b/druntime/test/init_fini/src/custom_gc.d index bcbd84c844..b85aa889da 100644 --- a/druntime/test/init_fini/src/custom_gc.d +++ b/druntime/test/init_fini/src/custom_gc.d @@ -1,6 +1,6 @@ -import core.gc.registry; import core.gc.gcinterface; -import core.stdc.stdlib; +import core.gc.registry; +import core.stdc.stdlib : calloc, malloc, realloc; static import core.memory; diff --git a/druntime/test/init_fini/src/thread_join.d b/druntime/test/init_fini/src/thread_join.d index a40cd5ebe0..b7700429bd 100644 --- a/druntime/test/init_fini/src/thread_join.d +++ b/druntime/test/init_fini/src/thread_join.d @@ -1,7 +1,6 @@ // Bugzilla 11309 - std.concurrency: OwnerTerminated message doesn't work // We need to assure that the thread dtors of parent threads run before the thread dtors of the child threads. import core.thread, core.sync.semaphore; -import core.stdc.stdio; __gshared Semaphore sem; diff --git a/druntime/test/shared/src/finalize.d b/druntime/test/shared/src/finalize.d index d61cd490a4..1f911a9299 100644 --- a/druntime/test/shared/src/finalize.d +++ b/druntime/test/shared/src/finalize.d @@ -1,6 +1,5 @@ import core.runtime; -import core.stdc.stdio; -import core.stdc.string; +import core.stdc.string : strrchr; import core.thread; void runTest() diff --git a/druntime/test/shared/src/load.d b/druntime/test/shared/src/load.d index 2ea98650f0..0a7cd0ea59 100644 --- a/druntime/test/shared/src/load.d +++ b/druntime/test/shared/src/load.d @@ -1,6 +1,5 @@ import core.runtime; -import core.stdc.stdio; -import core.stdc.string; +import core.stdc.string : strrchr; import core.thread; version (DragonFlyBSD) import core.sys.dragonflybsd.dlfcn : RTLD_NOLOAD; diff --git a/druntime/test/shared/src/load_13414.d b/druntime/test/shared/src/load_13414.d index fd6ad6a824..4e2b590daa 100644 --- a/druntime/test/shared/src/load_13414.d +++ b/druntime/test/shared/src/load_13414.d @@ -1,6 +1,6 @@ -import core.runtime; import core.atomic; -import core.stdc.string; +import core.runtime; +import core.stdc.string : strrchr; shared uint tlsDtor, dtor; void staticDtorHook() { atomicOp!"+="(tlsDtor, 1); } diff --git a/druntime/test/shared/src/load_linkdep.d b/druntime/test/shared/src/load_linkdep.d index ceb31a3cb6..c86f71789a 100644 --- a/druntime/test/shared/src/load_linkdep.d +++ b/druntime/test/shared/src/load_linkdep.d @@ -1,5 +1,5 @@ import core.runtime; -import core.stdc.string; +import core.stdc.string : strrchr; extern(C) alias RunDepTests = int function(); diff --git a/druntime/test/shared/src/load_loaddep.d b/druntime/test/shared/src/load_loaddep.d index 3410f93142..fb0335faea 100644 --- a/druntime/test/shared/src/load_loaddep.d +++ b/druntime/test/shared/src/load_loaddep.d @@ -1,5 +1,5 @@ import core.runtime; -import core.stdc.string; +import core.stdc.string : strrchr; extern(C) alias RunDepTests = int function(const char*); diff --git a/druntime/test/thread/src/tlsgc_sections.d b/druntime/test/thread/src/tlsgc_sections.d index 1bd3f26cff..b0807ec6ff 100644 --- a/druntime/test/thread/src/tlsgc_sections.d +++ b/druntime/test/thread/src/tlsgc_sections.d @@ -11,7 +11,7 @@ class C { ~this() { - import core.stdc.stdlib; + import core.stdc.stdlib : abort; abort(); // this gets triggered although the instance always stays referenced } } diff --git a/druntime/test/thread/src/tlsstack.d b/druntime/test/thread/src/tlsstack.d index dbd93213bf..7b76f22fa9 100644 --- a/druntime/test/thread/src/tlsstack.d +++ b/druntime/test/thread/src/tlsstack.d @@ -1,6 +1,6 @@ module core.thread.test; // needs access to getStackTop()/getStackBottom() -import core.stdc.stdio; +import core.stdc.stdio : printf; import core.thread; ubyte[16384] data; diff --git a/druntime/test/unittest/customhandler.d b/druntime/test/unittest/customhandler.d index f5a04350d9..2beeb78ad8 100644 --- a/druntime/test/unittest/customhandler.d +++ b/druntime/test/unittest/customhandler.d @@ -16,6 +16,6 @@ shared static this() void main() { - import core.stdc.stdio; + import core.stdc.stdio : fprintf, stderr; fprintf(stderr, "main\n"); }