mirror of
https://github.com/dlang/phobos.git
synced 2025-04-27 21:51:40 +03:00
Use selective top-level module imports in std.{path,range,regex}
This commit is contained in:
parent
24209a6cb7
commit
8bc39461aa
3 changed files with 14 additions and 6 deletions
|
@ -96,8 +96,7 @@ $(TR $(TD Other) $(TD
|
|||
module std.path;
|
||||
|
||||
|
||||
// FIXME
|
||||
import std.file; //: getcwd;
|
||||
import std.file : getcwd;
|
||||
static import std.meta;
|
||||
import std.range.primitives;
|
||||
import std.traits;
|
||||
|
|
|
@ -233,9 +233,9 @@ public import std.range.interfaces;
|
|||
public import std.range.primitives;
|
||||
public import std.typecons : Flag, Yes, No;
|
||||
|
||||
import std.meta; // allSatisfy, staticMap
|
||||
import std.traits; // CommonType, isCallable, isFloatingPoint, isIntegral,
|
||||
// isPointer, isSomeFunction, isStaticArray, Unqual, isInstanceOf
|
||||
import std.meta : allSatisfy, staticMap;
|
||||
import std.traits : CommonType, isCallable, isFloatingPoint, isIntegral,
|
||||
isPointer, isSomeFunction, isStaticArray, Unqual, isInstanceOf;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -3674,6 +3674,7 @@ private struct Generator(Fun...)
|
|||
{
|
||||
static assert(Fun.length == 1);
|
||||
static assert(isInputRange!Generator);
|
||||
import std.traits : FunctionAttribute, functionAttributes, ReturnType;
|
||||
|
||||
private:
|
||||
static if (is(Fun[0]))
|
||||
|
@ -4650,6 +4651,7 @@ if (Ranges.length && allSatisfy!(isInputRange, Ranges))
|
|||
auto zip(Ranges...)(Ranges ranges)
|
||||
if (Ranges.length && allSatisfy!(isInputRange, Ranges))
|
||||
{
|
||||
import std.meta : anySatisfy, templateOr;
|
||||
static if (allSatisfy!(isInfinite, Ranges) || Ranges.length == 1)
|
||||
{
|
||||
return ZipShortest!(Ranges)(ranges);
|
||||
|
@ -4831,6 +4833,7 @@ package struct ZipShortest(Flag!"allKnownSameLength" allKnownSameLength, Ranges.
|
|||
if (Ranges.length && allSatisfy!(isInputRange, Ranges))
|
||||
{
|
||||
import std.format : format; //for generic mixins
|
||||
import std.meta : anySatisfy, templateOr;
|
||||
import std.typecons : Tuple;
|
||||
|
||||
deprecated("Use of an undocumented alias R.")
|
||||
|
@ -6448,6 +6451,7 @@ pure @safe unittest
|
|||
|
||||
pure nothrow @nogc @safe unittest
|
||||
{
|
||||
import std.traits : Signed;
|
||||
//float overloads use std.conv.to so can't be @nogc or nothrow
|
||||
alias ssize_t = Signed!size_t;
|
||||
assert(iota(ssize_t.max, 0, -1).length == ssize_t.max);
|
||||
|
@ -9603,6 +9607,7 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
import std.meta : Filter, templateNot;
|
||||
alias SliceableDummyRanges = Filter!(hasSlicing, AllDummyRanges);
|
||||
|
||||
static foreach (Partial; [Yes.withPartial, No.withPartial])
|
||||
|
@ -12109,6 +12114,7 @@ if (isInputRange!R)
|
|||
private struct Bitwise(R)
|
||||
if (isInputRange!R && isIntegral!(ElementType!R))
|
||||
{
|
||||
import std.traits : Unsigned;
|
||||
private:
|
||||
alias ElemType = ElementType!R;
|
||||
alias UnsignedElemType = Unsigned!ElemType;
|
||||
|
@ -12424,6 +12430,7 @@ if (isInputRange!R && isIntegral!(ElementType!R))
|
|||
// Test all range types over all integral types
|
||||
@safe pure nothrow unittest
|
||||
{
|
||||
import std.meta : AliasSeq;
|
||||
import std.internal.test.dummyrange;
|
||||
|
||||
alias IntegralTypes = AliasSeq!(byte, ubyte, short, ushort, int, uint,
|
||||
|
@ -12520,6 +12527,7 @@ if (isInputRange!R && isIntegral!(ElementType!R))
|
|||
// Test opIndex and opSlice
|
||||
@system unittest
|
||||
{
|
||||
import std.meta : AliasSeq;
|
||||
alias IntegralTypes = AliasSeq!(byte, ubyte, short, ushort, int, uint,
|
||||
long, ulong);
|
||||
foreach (IntegralType; IntegralTypes)
|
||||
|
|
|
@ -298,7 +298,7 @@ module std.regex;
|
|||
|
||||
import std.range.primitives, std.traits;
|
||||
import std.regex.internal.ir;
|
||||
import std.typecons; // : Flag, Yes, No;
|
||||
import std.typecons : Flag, Yes, No;
|
||||
|
||||
/++
|
||||
`Regex` object holds regular expression pattern in compiled form.
|
||||
|
@ -682,6 +682,7 @@ public:
|
|||
@trusted public struct RegexMatch(R)
|
||||
if (isSomeString!R)
|
||||
{
|
||||
import std.typecons : Rebindable;
|
||||
private:
|
||||
alias Char = BasicElementOf!R;
|
||||
Matcher!Char _engine;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue