Skip to content

Revert "[DEMO for DIP1005] Converted imports to selective imports in std.array" #4964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
Dec 25, 2016
Merged

Revert "[DEMO for DIP1005] Converted imports to selective imports in std.array" #4964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions std/array.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,13 @@ Source: $(PHOBOSSRC std/_array.d)
*/
module std.array;

static import std.algorithm.iteration; // FIXME, remove with alias
// of splitter
import std.functional : unaryFun;
import std.meta : AliasSeq, allSatisfy, staticMap;
import std.range.primitives : ElementEncodingType, ElementType, hasLength,
isBidirectionalRange, isForwardRange, isInfinite, isInputRange,
isOutputRange, isRandomAccessRange, put;
public import std.range.primitives : save, empty, popFront, popBack, front,
back;
import std.traits : ForeachType, Unqual, hasElaborateAssign,
hasElaborateCopyConstructor, hasIndirections, isArray, isAssignable,
isDynamicArray, isImplicitlyConvertible, isIntegral, isIterable, isMutable,
isNarrowString, isSomeChar, isSomeString, isStaticArray;
import std.meta;
import std.traits;
import std.functional;
static import std.algorithm.iteration; // FIXME, remove with alias of splitter

import std.range.primitives;
public import std.range.primitives : save, empty, popFront, popBack, front, back;

/**
* Allocates an array and initializes it with copies of the elements
Expand Down Expand Up @@ -350,7 +344,7 @@ See_Also: $(REF Tuple, std,typecons)
*/

auto assocArray(Range)(Range r)
if (isInputRange!Range)
if (isInputRange!Range)
Copy link
Contributor

@joakim-noah joakim-noah Dec 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't add the space back.

Copy link
Contributor

@wilzbach wilzbach Dec 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's an automatic revert & the spaces before the if constraint are the common Phobos style

Copy link
Member Author

@andralex andralex Dec 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wilzbach we've gone back and forth with the style. I think if should be flush with the previous line (no extra indent). Could you please work your magic on the autotester to make it so? :)

Copy link
Contributor

@wilzbach wilzbach Dec 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we've gone back and forth with the style. I think if should be flush with the previous line (no extra indent).

dlang/dlang.org#1534

Could you please work your magic on the autotester to make it so?

I will give it a try :)

{
import std.typecons : isTuple;

Expand Down