Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

pure functions infer scope, but not return 4 #2995

Merged
WalterBright merged 1 commit into from
Mar 17, 2020
Merged

pure functions infer scope, but not return 4 #2995

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions src/core/internal/utf.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ void validate(S)(const scope S s)
/* =================== Conversion to UTF8 ======================= */

@safe pure nothrow @nogc
char[] toUTF8(char[] buf, dchar c)
char[] toUTF8(return char[] buf, dchar c)
in
{
assert(isValidDchar(c));
Expand Down Expand Up @@ -623,7 +623,7 @@ char[] toUTF8(char[] buf, dchar c)
* Encodes string s into UTF-8 and returns the encoded string.
*/
@safe pure nothrow
string toUTF8(string s)
string toUTF8(return string s)
in
{
validate(s);
Expand Down Expand Up @@ -784,7 +784,7 @@ wptr toUTF16z(const scope char[] s)

/** ditto */
@safe pure nothrow
wstring toUTF16(wstring s)
wstring toUTF16(return wstring s)
in
{
validate(s);
Expand Down Expand Up @@ -864,7 +864,7 @@ dstring toUTF32(const scope wchar[] s)

/** ditto */
@safe pure nothrow
dstring toUTF32(dstring s)
dstring toUTF32(return dstring s)
in
{
validate(s);
Expand Down
2 changes: 1 addition & 1 deletion src/core/sys/posix/sys/socket.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ version (CRuntime_Glibc)
}
else
{
extern (D) inout(ubyte)* CMSG_DATA( inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
extern (D) inout(ubyte)* CMSG_DATA( return inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
}

private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
Expand Down
4 changes: 2 additions & 2 deletions src/object.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1031,8 +1031,8 @@ class TypeInfo_Class : TypeInfo
return m_offTi;
}

@property auto info() @safe nothrow pure const { return this; }
@property auto typeinfo() @safe nothrow pure const { return this; }
@property auto info() @safe nothrow pure const return { return this; }
@property auto typeinfo() @safe nothrow pure const return { return this; }

byte[] m_init; /** class static initializer
* (init.length gives size in bytes of class)
Expand Down