Skip to content

Commit 97ab0c9

Browse files
wilzbachwilzbach
committed
Use selective imports for module imports
sed -E 's!import (.*); // :!import \1 :!' -i **/*.d
1 parent 82ad5c0 commit 97ab0c9

17 files changed

Lines changed: 77 additions & 51 deletions

File tree

‎std/algorithm/comparison.d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ T2=$(TR $(TDNW $(LREF $1)) $(TD $+))
5959
module std.algorithm.comparison;
6060

6161
// FIXME
62-
import std.functional; // : unaryFun, binaryFun;
62+
import std.functional : unaryFun, binaryFun;
6363
import std.range.primitives;
6464
import std.traits;
6565
// FIXME
6666
import std.meta : allSatisfy;
67-
import std.typecons; // : tuple, Tuple, Flag, Yes;
67+
import std.typecons : tuple, Tuple, Flag, Yes;
6868

6969
/**
7070
Find `value` _among `values`, returning the 1-based index

‎std/algorithm/iteration.d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ T2=$(TR $(TDNW $(LREF $1)) $(TD $+))
6767
module std.algorithm.iteration;
6868

6969
// FIXME
70-
import std.functional; // : unaryFun, binaryFun;
70+
import std.functional : unaryFun, binaryFun;
7171
import std.range.primitives;
7272
import std.traits;
7373

‎std/algorithm/mutation.d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ module std.algorithm.mutation;
8080
import std.range.primitives;
8181
import std.traits : isArray, isBlitAssignable, isNarrowString, Unqual, isSomeChar;
8282
// FIXME
83-
import std.typecons; // : tuple, Tuple;
83+
import std.typecons : tuple, Tuple;
8484

8585
// bringToFront
8686
/**

‎std/algorithm/searching.d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ T2=$(TR $(TDNW $(LREF $1)) $(TD $+))
106106
module std.algorithm.searching;
107107

108108
// FIXME
109-
import std.functional; // : unaryFun, binaryFun;
109+
import std.functional : unaryFun, binaryFun;
110110
import std.range.primitives;
111111
import std.traits;
112112
// FIXME
113-
import std.typecons; // : Tuple, Flag, Yes, No;
113+
import std.typecons : Tuple, tuple, Flag, Yes, No;
114114

115115
/++
116116
Checks if $(I _all) of the elements verify `pred`.

‎std/algorithm/setops.d‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ module std.algorithm.setops;
5050
import std.range.primitives;
5151

5252
// FIXME
53-
import std.functional; // : unaryFun, binaryFun;
53+
import std.functional : unaryFun, binaryFun;
5454
import std.traits;
5555
// FIXME
56-
import std.meta; // : AliasSeq, staticMap, allSatisfy, anySatisfy;
56+
import std.meta : AliasSeq, staticMap, allSatisfy, anySatisfy;
5757

58-
import std.algorithm.sorting; // : Merge;
58+
import std.algorithm.sorting : Merge;
5959
import std.typecons : No;
6060

6161
// cartesianProduct

‎std/algorithm/sorting.d‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ T2=$(TR $(TDNW $(LREF $1)) $(TD $+))
7676
module std.algorithm.sorting;
7777

7878
import std.algorithm.mutation : SwapStrategy;
79-
import std.functional; // : unaryFun, binaryFun;
79+
import std.functional : unaryFun, binaryFun;
8080
import std.range.primitives;
81-
import std.typecons : Flag;
81+
import std.typecons : Flag, Yes, No;
8282
// FIXME
83-
import std.meta; // : allSatisfy;
84-
import std.range; // : SortedRange;
83+
import std.meta : allSatisfy;
84+
import std.range : SortedRange;
8585
import std.traits;
8686

8787
/**
@@ -747,7 +747,9 @@ if (isRandomAccessRange!Range && hasLength!Range && hasSlicing!Range)
747747
assert(a == [ 42, 42 ]);
748748

749749
import std.algorithm.iteration : map;
750+
import std.array : array;
750751
import std.random;
752+
import std.range : iota;
751753
import std.stdio;
752754
auto s = unpredictableSeed;
753755
auto g = Random(s);
@@ -1059,6 +1061,7 @@ if (isRandomAccessRange!Range && !isInfinite!Range &&
10591061
@safe unittest
10601062
{
10611063
import std.algorithm.comparison : equal;
1064+
import std.range : iota;
10621065

10631066
ubyte[256] index = void;
10641067
iota(256).makeIndex(index[]);
@@ -1537,7 +1540,8 @@ private void multiSortImpl(Range, SwapStrategy ss, funs...)(Range r)
15371540
@safe unittest
15381541
{
15391542
import std.algorithm.comparison : equal;
1540-
import std.range;
1543+
import std.array : array;
1544+
import std.range : indexed, iota, retro;
15411545

15421546
static struct Point { int x, y; }
15431547
auto pts1 = [ Point(5, 6), Point(1, 0), Point(5, 7), Point(1, 1), Point(1, 2), Point(0, 1) ];
@@ -1784,6 +1788,7 @@ private void sort5(alias lt, Range)(Range r)
17841788
{
17851789
import std.algorithm.iteration : permutations;
17861790
import std.algorithm.mutation : copy;
1791+
import std.range : iota;
17871792

17881793
int[5] buf;
17891794
foreach (per; iota(5).permutations)
@@ -1925,6 +1930,9 @@ if (((ss == SwapStrategy.unstable && (hasSwappableElements!Range ||
19251930
{
19261931
// Simple regression benchmark
19271932
import std.algorithm.iteration, std.algorithm.mutation, std.random;
1933+
import std.array : array;
1934+
import std.range : iota;
1935+
19281936
Random rng;
19291937
int[] a = iota(20148).map!(_ => uniform(-1000, 1000, rng)).array;
19301938
static uint comps;
@@ -3436,6 +3444,8 @@ done:
34363444

34373445
@safe unittest
34383446
{
3447+
import std.array : array;
3448+
34393449
auto a = [ 10, 5, 3, 4, 8, 11, 13, 3, 9, 4, 10 ];
34403450
assert(expandPartition!((a, b) => a < b)(a, 4, 5, 6) == 9);
34413451
a = randomArray;
@@ -3450,7 +3460,10 @@ private T[] randomArray(Flag!"exactSize" flag = No.exactSize, T = int)(
34503460
T minValue = 0, T maxValue = 255)
34513461
{
34523462
import std.algorithm.iteration : map;
3463+
import std.array : array;
34533464
import std.random : unpredictableSeed, Random, uniform;
3465+
import std.range : iota;
3466+
34543467
auto size = flag == Yes.exactSize ? maxSize : uniform(1, maxSize);
34553468
return iota(0, size).map!(_ => uniform(minValue, maxValue)).array;
34563469
}

‎std/ascii.d‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ module std.ascii;
6262
version (unittest)
6363
{
6464
// FIXME: When dmd bug #314 is fixed, make these selective.
65-
import std.meta; // : AliasSeq;
66-
import std.range; // : chain;
67-
import std.traits; // : functionAttributes, FunctionAttribute, isSafe;
65+
import std.meta : AliasSeq;
66+
import std.range : chain;
67+
import std.traits : functionAttributes, FunctionAttribute, isSafe;
6868
}
6969

7070

@@ -675,6 +675,8 @@ if (is(C : dchar))
675675

676676
@safe unittest //Test both toUpper and toLower with non-builtin
677677
{
678+
import std.traits : OriginalType;
679+
678680
//User Defined [Char|Wchar|Dchar]
679681
static struct UDC { char c; alias c this; }
680682
static struct UDW { wchar c; alias c this; }

‎std/experimental/typecons.d‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Authors: $(HTTP erdani.org, Andrei Alexandrescu),
2020
*/
2121
module std.experimental.typecons;
2222

23-
import std.meta; // : AliasSeq, allSatisfy;
23+
import std.meta : AliasSeq, allSatisfy;
2424
import std.traits;
2525

2626
import std.typecons : Tuple, tuple, Bind, DerivedFunctionType, GetOverloadedMethods;

‎std/functional.d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ Distributed under the Boost Software License, Version 1.0.
6161
*/
6262
module std.functional;
6363

64-
import std.meta; // AliasSeq, Reverse
65-
import std.traits; // isCallable, Parameters
64+
import std.meta : AliasSeq, Reverse;
65+
import std.traits : isCallable, Parameters;
6666

6767

6868
private template needOpCallAlias(alias fun)

‎std/math.d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static import core.math;
134134
static import core.stdc.math;
135135
static import core.stdc.fenv;
136136
import std.range.primitives : isInputRange, ElementType;
137-
import std.traits; // CommonType, isFloatingPoint, isIntegral, isSigned, isUnsigned, Largest, Unqual
137+
import std.traits : CommonType, isFloatingPoint, isIntegral, isNumeric, isSigned, isUnsigned, Largest, Unqual;
138138

139139
version(LDC)
140140
{
@@ -175,7 +175,7 @@ else
175175

176176
version(unittest)
177177
{
178-
import core.stdc.stdio; // : sprintf;
178+
import core.stdc.stdio : sprintf;
179179

180180
static if (real.sizeof > double.sizeof)
181181
enum uint useDigits = 16;

0 commit comments

Comments
 (0)