mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-28 06:00:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Scope std.typecons : Tuple imports

Browse source
This commit is contained in:
monarchdodra 2014-04-21 23:25:05 +02:00
parent 9579b42cc5
commit 8d2b33c594
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
std/range.d
View file

@ -291,7 +291,6 @@ import std.algorithm : copy, count, equal, filter, filterBidirectional,
findSplitBefore, group, isSorted, joiner, move, map, max, min, sort, swap, findSplitBefore, group, isSorted, joiner, move, map, max, min, sort, swap,
until; until;
import std.traits; import std.traits;
import std.typecons : Tuple, tuple;
import std.typetuple : allSatisfy, staticMap, TypeTuple; import std.typetuple : allSatisfy, staticMap, TypeTuple;
// For testing only. This code is included in a string literal to be included // For testing only. This code is included in a string literal to be included
@ -869,6 +868,7 @@ unittest
unittest unittest
{ {
import std.conv : to; import std.conv : to;
import std.typecons : tuple;
static struct PutC(C) static struct PutC(C)
{ {
@ -4660,6 +4660,7 @@ struct Zip(Ranges...)
if (Ranges.length && allSatisfy!(isInputRange, Ranges)) if (Ranges.length && allSatisfy!(isInputRange, Ranges))
{ {
import std.string : format; //for generic mixins import std.string : format; //for generic mixins
import std.typecons : Tuple;
alias R = Ranges; alias R = Ranges;
R ranges; R ranges;
@ -5029,6 +5030,7 @@ enum StoppingPolicy
unittest unittest
{ {
import std.exception : assertThrown, assertNotThrown; import std.exception : assertThrown, assertNotThrown;
import std.typecons : tuple;
int[] a = [ 1, 2, 3 ]; int[] a = [ 1, 2, 3 ];
float[] b = [ 1.0, 2.0, 3.0 ]; float[] b = [ 1.0, 2.0, 3.0 ];
@ -5152,6 +5154,7 @@ unittest
@safe pure unittest @safe pure unittest
{ {
import std.typecons : tuple;
auto LL = iota(1L, 1000L); auto LL = iota(1L, 1000L);
auto z = zip(LL, [4]); auto z = zip(LL, [4]);
@ -5585,9 +5588,11 @@ public:
} }
/// Ditto /// Ditto
Sequence!(fun, Tuple!(State)) sequence(alias fun, State...)(State args) auto sequence(alias fun, State...)(State args)
{ {
return typeof(return)(tuple(args)); import std.typecons : Tuple, tuple;
alias Return = Sequence!(fun, Tuple!State);
return Return(tuple(args));
} }
/// ///
@ -5603,8 +5608,8 @@ unittest
unittest unittest
{ {
auto y = Sequence!("a[0] + n * a[1]", Tuple!(int, int)) import std.typecons : Tuple, tuple;
(tuple(0, 4)); auto y = Sequence!("a[0] + n * a[1]", Tuple!(int, int))(tuple(0, 4));
static assert(isForwardRange!(typeof(y))); static assert(isForwardRange!(typeof(y)));
//@@BUG //@@BUG
@ -7539,6 +7544,7 @@ unittest
// Tests the single-element result // Tests the single-element result
unittest unittest
{ {
import std.typecons : tuple;
foreach (x; tuple(1, '1', 1.0, "1", [1])) foreach (x; tuple(1, '1', 1.0, "1", [1]))
{ {
auto a = only(x); auto a = only(x);
@ -8664,6 +8670,7 @@ assert(equal(r[2], [ 4, 4, 5, 6 ]));
auto trisect(V)(V value) auto trisect(V)(V value)
if (isTwoWayCompatible!(predFun, ElementType!Range, V)) if (isTwoWayCompatible!(predFun, ElementType!Range, V))
{ {
import std.typecons : tuple;
size_t first = 0, count = _input.length; size_t first = 0, count = _input.length;
while (count > 0) while (count > 0)
{ {