From a8cd46e149a64b1deed2bcec8b0b5fd858aeef0b Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Tue, 18 May 2021 01:04:18 +0200 Subject: [PATCH] Revert "Annotate std/string.d to please dlang/dmd#12520" This reverts commit 086ad984dd9cac51c8b2de96ce4e008748e1b7c7. --- std/string.d | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/std/string.d b/std/string.d index 5abcc4c26..452d51c28 100644 --- a/std/string.d +++ b/std/string.d @@ -148,13 +148,13 @@ version (StdUnittest) private: struct TestAliasedString { - string get() @safe @nogc pure nothrow return scope { return _s; } + string get() @safe @nogc pure nothrow { return _s; } alias get this; @disable this(this); string _s; } - bool testAliasedString(alias func, Args...)(scope string s, scope Args args) + bool testAliasedString(alias func, Args...)(string s, Args args) { import std.algorithm.comparison : equal; auto a = func(TestAliasedString(s), args); @@ -6432,7 +6432,7 @@ if (isConvertibleToString!Range) * See_Also: * $(LREF soundexer) */ -char[] soundex(scope const(char)[] str, return scope char[] buffer = null) +char[] soundex(scope const(char)[] str, char[] buffer = null) @safe pure nothrow in { @@ -6937,7 +6937,7 @@ void main() { * StringException if indentation is done with different sequences * of whitespace characters. */ -S[] outdent(S)(return scope S[] lines) @safe pure +S[] outdent(S)(S[] lines) @safe pure if (isSomeString!S) { import std.algorithm.searching : startsWith;