diff --git a/.dscanner.ini b/.dscanner.ini index a443acc00c9..500b7658477 100644 --- a/.dscanner.ini +++ b/.dscanner.ini @@ -57,7 +57,7 @@ mismatched_args_check="disabled" ; Checks for labels with the same name as variables label_var_same_name_check="disabled" ; Checks for lines longer than 120 characters -long_line_check="disabled" ; FIXME +long_line_check="enabled" ; Checks for assignment to auto-ref function parameters auto_ref_assignment_check="disabled" ; FIXME ; Checks for incorrect infinite range definitions diff --git a/std/conv.d b/std/conv.d index 4a3449a0773..08fb9dd6490 100644 --- a/std/conv.d +++ b/std/conv.d @@ -3551,7 +3551,8 @@ Lfewerr: * '[')), right bracket (default $(D ']')), key-value separator (default $(D * ':')), and element seprator (by default $(D ',')). */ -Target parse(Target, Source)(ref Source s, dchar lbracket = '[', dchar rbracket = ']', dchar keyval = ':', dchar comma = ',') +Target parse(Target, Source)(ref Source s, dchar lbracket = '[', + dchar rbracket = ']', dchar keyval = ':', dchar comma = ',') if (isExactSomeString!Source && isAssociativeArray!Target && !is(Target == enum)) { diff --git a/std/experimental/ndslice/iteration.d b/std/experimental/ndslice/iteration.d index bb26678238e..9e39bd8fee7 100644 --- a/std/experimental/ndslice/iteration.d +++ b/std/experimental/ndslice/iteration.d @@ -1037,8 +1037,9 @@ template dropBackExactly(Dimensions...) { static if (!allSatisfy!(isSize_t, Dimensions)) alias dropBackExactly = .dropBackExactly!(staticMap!(toSize_t, Dimensions)); - else - @fmb Slice!(N, Range) dropBackExactly(size_t N, Range)(Slice!(N, Range) slice, Repeat!(Dimensions.length, size_t) ns) +else + @fmb Slice!(N, Range) dropBackExactly(size_t N, Range)(Slice!(N, Range) slice, + Repeat!(Dimensions.length, size_t) ns) body { foreach (i, dimension; Dimensions) diff --git a/std/experimental/ndslice/slice.d b/std/experimental/ndslice/slice.d index 1b70507613f..0e59d3d4421 100644 --- a/std/experimental/ndslice/slice.d +++ b/std/experimental/ndslice/slice.d @@ -2200,7 +2200,8 @@ struct Slice(size_t _N, _Range) } else { - hasher.putElements(cast(hasher.Element[]) r._ptr._range[r._ptr._shift .. r.length + r._ptr._shift]); + hasher.putElements( + cast(hasher.Element[]) r._ptr._range[r._ptr._shift .. r.length + r._ptr._shift]); } return hasher.get; } diff --git a/std/format.d b/std/format.d index 5b409b92289..bf28349e0ad 100644 --- a/std/format.d +++ b/std/format.d @@ -4449,7 +4449,8 @@ unittest Reads a floating-point value and returns it. */ T unformatValue(T, Range, Char)(ref Range input, ref FormatSpec!Char spec) - if (isFloatingPoint!T && !is(T == enum) && isInputRange!Range && isSomeChar!(ElementType!Range) && !is(Range == enum)) + if (isFloatingPoint!T && !is(T == enum) && isInputRange!Range + && isSomeChar!(ElementType!Range)&& !is(Range == enum)) { import std.algorithm.searching : find; import std.conv : parse, text; @@ -5230,7 +5231,8 @@ void main() } ------------------------ */ -deprecated("It will be removed from Phobos in October 2016. If you still need it, go to https://github.com/DigitalMars/undeaD") +deprecated("It will be removed from Phobos in October 2016. "~ + "If you still need it, go to https://github.com/DigitalMars/undeaD") // @@@DEPRECATED_2016-10@@@ void doFormat()(scope void delegate(dchar) putc, TypeInfo[] arguments, va_list ap) { diff --git a/std/math.d b/std/math.d index b0e2de6f1a0..01ebdce0985 100644 --- a/std/math.d +++ b/std/math.d @@ -7777,7 +7777,8 @@ bool isPowerOf2(X)(const X x) pure @safe nothrow @nogc { immutable min_sub = X.min_normal * X.epsilon; - foreach (x; AliasSeq!(smallP2, min_sub, X.min_normal, .25L, 0.5L, 1.0L, 2.0L, 8.0L, pow(2.0L, X.max_exp - 1), bigP2)) + foreach (x; AliasSeq!(smallP2, min_sub, X.min_normal, .25L, 0.5L, 1.0L, + 2.0L, 8.0L, pow(2.0L, X.max_exp - 1), bigP2)) { assert( isPowerOf2(cast(X) x)); assert(!isPowerOf2(cast(X)-x)); diff --git a/std/regex/internal/tests2.d b/std/regex/internal/tests2.d index 3a09083522a..ab08cebfff9 100644 --- a/std/regex/internal/tests2.d +++ b/std/regex/internal/tests2.d @@ -224,8 +224,8 @@ unittest == to!String("ack capacity")); assert(std.regex.replace!(matchFn)(to!String("noon"), regex(to!String("^n")), to!String("[$&]")) == to!String("[n]oon")); - assert(std.regex.replace!(matchFn)(to!String("test1 test2"), regex(to!String(`\w+`),"g"), to!String("$`:$'")) - == to!String(": test2 test1 :")); + assert(std.regex.replace!(matchFn)(to!String("test1 test2"), + regex(to!String(`\w+`), "g"), to!String("$`:$'")) == to!String(": test2 test1 :")); auto s = std.regex.replace!(baz!(Captures!(String)))(to!String("Strap a rocket engine on a chicken."), regex(to!String("[ar]"), "g")); assert(s == "StRAp A Rocket engine on A chicken.", text(s)); diff --git a/std/socket.d b/std/socket.d index 514ec9b4e89..6b28ece32cc 100644 --- a/std/socket.d +++ b/std/socket.d @@ -1067,7 +1067,8 @@ private AddressInfo[] getAddressInfoImpl(in char[] node, in char[] service, addr if (getaddrinfoPointer) { - auto results = getAddressInfo(null, "1234", AddressInfoFlags.PASSIVE, SocketType.STREAM, ProtocolType.TCP, AddressFamily.INET); + auto results = getAddressInfo(null, "1234", AddressInfoFlags.PASSIVE, + SocketType.STREAM, ProtocolType.TCP, AddressFamily.INET); assert(results.length == 1 && results[0].address.toString() == "0.0.0.0:1234"); } } @@ -3509,43 +3510,46 @@ unittest { class TestSocket : Socket { - override const pure nothrow @nogc @property @safe socket_t handle() { assert(false); } - override const nothrow @nogc @property @trusted bool blocking() { assert(false); } - override @property @trusted void blocking(bool byes) { assert(false); } - override @property @safe AddressFamily addressFamily() { assert(false); } - override const @property @trusted bool isAlive() { assert(false); } - override @trusted void bind(Address addr) { assert(false); } - override @trusted void connect(Address to) { assert(false); } - override @trusted void listen(int backlog) { assert(false); } - override protected pure nothrow @safe Socket accepting() { assert(false); } - override @trusted Socket accept() { assert(false); } - override nothrow @nogc @trusted void shutdown(SocketShutdown how) { assert(false); } - override nothrow @nogc @trusted void close() { assert(false); } - override @property @trusted Address remoteAddress() { assert(false); } - override @property @trusted Address localAddress() { assert(false); } - override @trusted ptrdiff_t send(const(void)[] buf, SocketFlags flags) { assert(false); } - override @safe ptrdiff_t send(const(void)[] buf) { assert(false); } - override @trusted ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags, Address to) { assert(false); } - override @safe ptrdiff_t sendTo(const(void)[] buf, Address to) { assert(false); } - override @trusted ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags) { assert(false); } - override @safe ptrdiff_t sendTo(const(void)[] buf) { assert(false); } - override @trusted ptrdiff_t receive(void[] buf, SocketFlags flags) { assert(false); } - override @safe ptrdiff_t receive(void[] buf) { assert(false); } - override @trusted ptrdiff_t receiveFrom(void[] buf, SocketFlags flags, ref Address from) { assert(false); } - override @safe ptrdiff_t receiveFrom(void[] buf, ref Address from) { assert(false); } - override @trusted ptrdiff_t receiveFrom(void[] buf, SocketFlags flags) { assert(false); } - override @safe ptrdiff_t receiveFrom(void[] buf) { assert(false); } - override @trusted int getOption(SocketOptionLevel level, SocketOption option, void[] result) { assert(false); } - override @trusted int getOption(SocketOptionLevel level, SocketOption option, out int32_t result) { assert(false); } - override @trusted int getOption(SocketOptionLevel level, SocketOption option, out Linger result) { assert(false); } - override @trusted void getOption(SocketOptionLevel level, SocketOption option, out Duration result) { assert(false); } - override @trusted void setOption(SocketOptionLevel level, SocketOption option, void[] value) { assert(false); } - override @trusted void setOption(SocketOptionLevel level, SocketOption option, int32_t value) { assert(false); } - override @trusted void setOption(SocketOptionLevel level, SocketOption option, Linger value) { assert(false); } - override @trusted void setOption(SocketOptionLevel level, SocketOption option, Duration value) { assert(false); } - override @safe string getErrorText() { assert(false); } - override @trusted void setKeepAlive(int time, int interval) { assert(false); } - override protected pure nothrow @safe Address createAddress() { assert(false); } + override + { + const pure nothrow @nogc @property @safe socket_t handle() { assert(0); } + const nothrow @nogc @property @trusted bool blocking() { assert(0); } + @property @trusted void blocking(bool byes) { assert(0); } + @property @safe AddressFamily addressFamily() { assert(0); } + const @property @trusted bool isAlive() { assert(0); } + @trusted void bind(Address addr) { assert(0); } + @trusted void connect(Address to) { assert(0); } + @trusted void listen(int backlog) { assert(0); } + protected pure nothrow @safe Socket accepting() { assert(0); } + @trusted Socket accept() { assert(0); } + nothrow @nogc @trusted void shutdown(SocketShutdown how) { assert(0); } + nothrow @nogc @trusted void close() { assert(0); } + @property @trusted Address remoteAddress() { assert(0); } + @property @trusted Address localAddress() { assert(0); } + @trusted ptrdiff_t send(const(void)[] buf, SocketFlags flags) { assert(0); } + @safe ptrdiff_t send(const(void)[] buf) { assert(0); } + @trusted ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags, Address to) { assert(0); } + @safe ptrdiff_t sendTo(const(void)[] buf, Address to) { assert(0); } + @trusted ptrdiff_t sendTo(const(void)[] buf, SocketFlags flags) { assert(0); } + @safe ptrdiff_t sendTo(const(void)[] buf) { assert(0); } + @trusted ptrdiff_t receive(void[] buf, SocketFlags flags) { assert(0); } + @safe ptrdiff_t receive(void[] buf) { assert(0); } + @trusted ptrdiff_t receiveFrom(void[] buf, SocketFlags flags, ref Address from) { assert(0); } + @safe ptrdiff_t receiveFrom(void[] buf, ref Address from) { assert(0); } + @trusted ptrdiff_t receiveFrom(void[] buf, SocketFlags flags) { assert(0); } + @safe ptrdiff_t receiveFrom(void[] buf) { assert(0); } + @trusted int getOption(SocketOptionLevel level, SocketOption option, void[] result) { assert(0); } + @trusted int getOption(SocketOptionLevel level, SocketOption option, out int32_t result) { assert(0); } + @trusted int getOption(SocketOptionLevel level, SocketOption option, out Linger result) { assert(0); } + @trusted void getOption(SocketOptionLevel level, SocketOption option, out Duration result) { assert(0); } + @trusted void setOption(SocketOptionLevel level, SocketOption option, void[] value) { assert(0); } + @trusted void setOption(SocketOptionLevel level, SocketOption option, int32_t value) { assert(0); } + @trusted void setOption(SocketOptionLevel level, SocketOption option, Linger value) { assert(0); } + @trusted void setOption(SocketOptionLevel level, SocketOption option, Duration value) { assert(0); } + @safe string getErrorText() { assert(0); } + @trusted void setKeepAlive(int time, int interval) { assert(0); } + protected pure nothrow @safe Address createAddress() { assert(0); } + } } }