mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-02 08:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #5546 from wilzbach/deprecation-halt

Browse source 
Trigger a hard error on deprecation messages
merged-on-behalf-of: Vladimir Panteleev <github@thecybershadow.net>
This commit is contained in:
The Dlang Bot 2017-07-06 01:41:02 +02:00 • committed by GitHub
commit e0fc939e38
12 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
circleci.sh
View file

@ -88,7 +88,7 @@ setup_repos()
# checkout a specific version of https://github.com/dlang/tools # checkout a specific version of https://github.com/dlang/tools
clone https://github.com/dlang/tools.git ../tools master clone https://github.com/dlang/tools.git ../tools master
git -C ../tools checkout 87c63705dcacac38ba7c84d19699f656d834139d git -C ../tools checkout df3dfa3061d25996ac98158d3bdb3525c8d89445
# load environment for bootstrap compiler # load environment for bootstrap compiler
source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)" source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"

2
posix.mak
View file

@ -115,7 +115,7 @@ else
endif endif
# Set DFLAGS # Set DFLAGS
DFLAGS=-conf= -I$(DRUNTIME_PATH)/import $(DMDEXTRAFLAGS) -w -dip25 $(MODEL_FLAG) $(PIC) DFLAGS=-conf= -I$(DRUNTIME_PATH)/import $(DMDEXTRAFLAGS) -w -de -dip25 $(MODEL_FLAG) $(PIC)
ifeq ($(BUILD),debug) ifeq ($(BUILD),debug)
DFLAGS += -g -debug DFLAGS += -g -debug
else else

2
std/algorithm/searching.d
View file

@ -637,7 +637,7 @@ if (isInputRange!Range && !isInfinite!Range &&
assert(count("ababab", "abab") == 1); assert(count("ababab", "abab") == 1);
assert(count("ababab", "abx") == 0); assert(count("ababab", "abx") == 0);
// fuzzy count range in range // fuzzy count range in range
assert(count!((a, b) => std.uni.toLower(a) == std.uni.toLower(b))("AbcAdFaBf", "ab") == 2); assert(count!((a, b) => toLower(a) == toLower(b))("AbcAdFaBf", "ab") == 2);
// count predicate in range // count predicate in range
assert(count!("a > 1")(a) == 8); assert(count!("a > 1")(a) == 8);
} }

1
std/csv.d
View file

@ -1099,7 +1099,6 @@ public:
} }
} }
///
@safe pure unittest @safe pure unittest
{ {
import std.algorithm.comparison : equal; import std.algorithm.comparison : equal;

6
std/datetime/timezone.d
View file

@ -2991,8 +2991,6 @@ else version(Windows)
static immutable(WindowsTimeZone) getTimeZone(string name) @trusted static immutable(WindowsTimeZone) getTimeZone(string name) @trusted
{ {
import std.utf : toUTF16;
scope baseKey = Registry.localMachine.getKey(`Software\Microsoft\Windows NT\CurrentVersion\Time Zones`); scope baseKey = Registry.localMachine.getKey(`Software\Microsoft\Windows NT\CurrentVersion\Time Zones`);
foreach (tzKeyName; baseKey.keyNames) foreach (tzKeyName; baseKey.keyNames)
@ -3015,8 +3013,8 @@ else version(Windows)
TIME_ZONE_INFORMATION tzInfo; TIME_ZONE_INFORMATION tzInfo;
auto wstdName = toUTF16(stdName); auto wstdName = stdName.to!wstring;
auto wdstName = toUTF16(dstName); auto wdstName = dstName.to!wstring;
auto wstdNameLen = wstdName.length > 32 ? 32 : wstdName.length; auto wstdNameLen = wstdName.length > 32 ? 32 : wstdName.length;
auto wdstNameLen = wdstName.length > 32 ? 32 : wdstName.length; auto wdstNameLen = wdstName.length > 32 ? 32 : wdstName.length;

16
std/file.d
View file

@ -2644,7 +2644,6 @@ version(Posix) @system unittest // input range of dchars
version(Windows) string getcwd() version(Windows) string getcwd()
{ {
import std.conv : to; import std.conv : to;
import std.utf : toUTF8;
/* GetCurrentDirectory's return value: /* GetCurrentDirectory's return value:
1. function succeeds: the number of characters that are written to 1. function succeeds: the number of characters that are written to
the buffer, not including the terminating null character. the buffer, not including the terminating null character.
@ -2658,7 +2657,7 @@ version(Windows) string getcwd()
// we can do it because toUTFX always produces a fresh string // we can do it because toUTFX always produces a fresh string
if (n < buffW.length) if (n < buffW.length)
{ {
return toUTF8(buffW[0 .. n]); return buffW[0 .. n].to!string;
} }
else //staticBuff isn't enough else //staticBuff isn't enough
{ {
@ -2666,7 +2665,7 @@ version(Windows) string getcwd()
scope(exit) free(ptr); scope(exit) free(ptr);
immutable n2 = GetCurrentDirectoryW(n, ptr); immutable n2 = GetCurrentDirectoryW(n, ptr);
cenforce(n2 && n2 < n, "getcwd"); cenforce(n2 && n2 < n, "getcwd");
return toUTF8(ptr[0 .. n2]); return ptr[0 .. n2].to!string;
} }
} }
else version (Solaris) string getcwd() else version (Solaris) string getcwd()
@ -2968,7 +2967,6 @@ else version(Windows)
{ {
struct DirEntry struct DirEntry
{ {
import std.utf : toUTF8;
public: public:
alias name this; alias name this;
@ -2994,12 +2992,12 @@ else version(Windows)
private this(string path, in WIN32_FIND_DATAW *fd) private this(string path, in WIN32_FIND_DATAW *fd)
{ {
import core.stdc.wchar_ : wcslen; import core.stdc.wchar_ : wcslen;
import std.conv : to;
import std.datetime.systime : FILETIMEToSysTime; import std.datetime.systime : FILETIMEToSysTime;
import std.path : buildPath; import std.path : buildPath;
size_t clength = wcslen(fd.cFileName.ptr); size_t clength = wcslen(fd.cFileName.ptr);
_name = toUTF8(fd.cFileName[0 .. clength]); _name = buildPath(path, fd.cFileName[0 .. clength].to!string);
_name = buildPath(path, toUTF8(fd.cFileName[0 .. clength]));
_size = (cast(ulong) fd.nFileSizeHigh << 32) | fd.nFileSizeLow; _size = (cast(ulong) fd.nFileSizeHigh << 32) | fd.nFileSizeLow;
_timeCreated = FILETIMEToSysTime(&fd.ftCreationTime); _timeCreated = FILETIMEToSysTime(&fd.ftCreationTime);
_timeLastAccessed = FILETIMEToSysTime(&fd.ftLastAccessTime); _timeLastAccessed = FILETIMEToSysTime(&fd.ftLastAccessTime);
@ -3431,7 +3429,7 @@ private void copyImpl(const(char)[] f, const(char)[] t, const(FSChar)* fromz, co
{ {
version(Windows) version(Windows)
{ {
assert(preserve == Yes.preserve); assert(preserve == Yes.preserveAttributes);
immutable result = CopyFileW(fromz, toz, false); immutable result = CopyFileW(fromz, toz, false);
if (!result) if (!result)
{ {
@ -4287,11 +4285,11 @@ string tempDir() @trusted
{ {
version(Windows) version(Windows)
{ {
import std.utf : toUTF8; import std.conv : to;
// http://msdn.microsoft.com/en-us/library/windows/desktop/aa364992(v=vs.85).aspx // http://msdn.microsoft.com/en-us/library/windows/desktop/aa364992(v=vs.85).aspx
wchar[MAX_PATH + 2] buf; wchar[MAX_PATH + 2] buf;
DWORD len = GetTempPathW(buf.length, buf.ptr); DWORD len = GetTempPathW(buf.length, buf.ptr);
if (len) cache = toUTF8(buf[0 .. len]); if (len) cache = buf[0 .. len].to!string;
} }
else version(Android) else version(Android)
{ {

7
std/string.d
View file

@ -5288,6 +5288,7 @@ if (isSomeString!S)
} }
deprecated
@safe pure @nogc unittest @safe pure @nogc unittest
{ {
import std.conv : to; import std.conv : to;
@ -5363,6 +5364,7 @@ if (isSomeString!S && isSomeString!S1)
return count; return count;
} }
deprecated
@safe pure @nogc unittest @safe pure @nogc unittest
{ {
import std.conv : to; import std.conv : to;
@ -5417,6 +5419,7 @@ if (isSomeString!S)
return s; return s;
} }
deprecated
@safe pure unittest @safe pure unittest
{ {
import std.conv : to; import std.conv : to;
@ -5433,6 +5436,7 @@ if (isSomeString!S)
}); });
} }
deprecated
@safe pure unittest @safe pure unittest
{ {
assert(removechars("abc", "x") == "abc"); assert(removechars("abc", "x") == "abc");
@ -5493,6 +5497,7 @@ S squeeze(S)(S s, in S pattern = null)
return changed ? ((r is null) ? s[0 .. lasti] : cast(S) r) : s; return changed ? ((r is null) ? s[0 .. lasti] : cast(S) r) : s;
} }
deprecated
@system pure unittest @system pure unittest
{ {
import std.conv : to; import std.conv : to;
@ -5549,6 +5554,7 @@ S1 munch(S1, S2)(ref S1 s, S2 pattern) @safe pure @nogc
} }
/// ///
deprecated
@safe pure @nogc unittest @safe pure @nogc unittest
{ {
string s = "123abc"; string s = "123abc";
@ -5558,6 +5564,7 @@ S1 munch(S1, S2)(ref S1 s, S2 pattern) @safe pure @nogc
assert(t == "" && s == "abc"); assert(t == "" && s == "abc");
} }
deprecated
@safe pure @nogc unittest @safe pure @nogc unittest
{ {
string s = "123€abc"; string s = "123€abc";

9
std/uni.d
View file

@ -2546,7 +2546,6 @@ private:
return this; return this;
} }
///
@safe unittest @safe unittest
{ {
assert(unicode.Cyrillic.intersect('-').byInterval.empty); assert(unicode.Cyrillic.intersect('-').byInterval.empty);
@ -4340,7 +4339,6 @@ if (sumOfIntegerTuple!sizes == 21)
} }
} }
///
@system pure unittest @system pure unittest
{ {
import std.algorithm.comparison : max; import std.algorithm.comparison : max;
@ -4644,7 +4642,6 @@ public struct MatcherConcept
return this; return this;
} }
///
@safe unittest @safe unittest
{ {
auto m = utfMatcher!char(unicode.Number); auto m = utfMatcher!char(unicode.Number);
@ -4762,9 +4759,9 @@ template Utf8Matcher()
static auto encode(size_t sz)(dchar ch) static auto encode(size_t sz)(dchar ch)
if (sz > 1) if (sz > 1)
{ {
import std.utf : encode; import std.utf : encodeUTF = encode;
char[4] buf; char[4] buf;
std.utf.encode(buf, ch); encodeUTF(buf, ch);
char[sz] ret; char[sz] ret;
buf[0] &= leadMask!sz; buf[0] &= leadMask!sz;
foreach (n; 1 .. sz) foreach (n; 1 .. sz)
@ -7380,7 +7377,7 @@ package auto simpleCaseFoldings(dchar ch) @safe
return len == 0; return len == 0;
} }
@property uint length() const @property size_t length() const
{ {
if (isSmall) if (isSmall)
{ {

3
std/windows/charset.d
View file

@ -53,7 +53,6 @@ version (Windows):
private import core.sys.windows.windows; private import core.sys.windows.windows;
private import std.conv; private import std.conv;
private import std.string; private import std.string;
private import std.utf;
private import std.windows.syserror; private import std.windows.syserror;
import std.internal.cstring; import std.internal.cstring;
@ -114,7 +113,7 @@ string fromMBSz(immutable(char)* s, int codePage = 0)
sysErrorString(GetLastError())); sysErrorString(GetLastError()));
} }
return std.utf.toUTF8(result[0 .. result.length-1]); // omit trailing null return result[0 .. result.length-1].to!string; // omit trailing null
} }
} }
return s[0 .. c-s]; // string is ASCII, no conversion necessary return s[0 .. c-s]; // string is ASCII, no conversion necessary

13
std/windows/registry.d
View file

@ -45,7 +45,6 @@ import std.exception;
import std.internal.cstring; import std.internal.cstring;
private import std.internal.windows.advapi32; private import std.internal.windows.advapi32;
import std.system : Endian, endian; import std.system : Endian, endian;
import std.utf : toUTF8, toUTF16;
import std.windows.syserror; import std.windows.syserror;
//debug = winreg; //debug = winreg;
@ -557,7 +556,7 @@ body
if (wstr.length && wstr[$-1] == '\0') if (wstr.length && wstr[$-1] == '\0')
wstr.length = wstr.length - 1; wstr.length = wstr.length - 1;
assert(wstr.length == 0 || wstr[$-1] != '\0'); assert(wstr.length == 0 || wstr[$-1] != '\0');
value = toUTF8(wstr); value = wstr.to!string;
break; break;
case REG_VALUE_TYPE.REG_DWORD_LITTLE_ENDIAN: case REG_VALUE_TYPE.REG_DWORD_LITTLE_ENDIAN:
@ -623,7 +622,7 @@ body
value.length = list.length; value.length = list.length;
foreach (i, ref v; value) foreach (i, ref v; value)
{ {
v = toUTF8(list[i]); v = list[i].to!string;
} }
} }
@ -752,7 +751,7 @@ private void regProcessNthKey(HKEY hkey, scope void delegate(scope LONG delegate
immutable res = regEnumKeyName(hkey, index, sName, cchName); immutable res = regEnumKeyName(hkey, index, sName, cchName);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
name = toUTF8(sName[0 .. cchName]); name = sName[0 .. cchName].to!string;
} }
return res; return res;
}); });
@ -774,7 +773,7 @@ private void regProcessNthValue(HKEY hkey, scope void delegate(scope LONG delega
immutable res = regEnumValueName(hkey, index, sName, cchName); immutable res = regEnumValueName(hkey, index, sName, cchName);
if (res == ERROR_SUCCESS) if (res == ERROR_SUCCESS)
{ {
name = toUTF8(sName[0 .. cchName]); name = sName[0 .. cchName].to!string;
} }
return res; return res;
}); });
@ -1098,7 +1097,7 @@ public:
wstring[] data = new wstring[value.length+1]; wstring[] data = new wstring[value.length+1];
foreach (i, ref s; data[0..$-1]) foreach (i, ref s; data[0..$-1])
{ {
s = toUTF16(value[i]); s = value[i].to!wstring;
} }
data[$-1] = "\0"; data[$-1] = "\0";
auto ws = std.array.join(data, "\0"w); auto ws = std.array.join(data, "\0"w);
@ -1235,7 +1234,7 @@ public:
ExpandEnvironmentStringsW(srcTmp, newValue.ptr, to!DWORD(newValue.length)), ExpandEnvironmentStringsW(srcTmp, newValue.ptr, to!DWORD(newValue.length)),
"Failed to expand environment variables"); "Failed to expand environment variables");
return toUTF8(newValue[0 .. count-1]); // remove trailing 0 return newValue[0 .. count-1].to!string; // remove trailing 0
} }
/** /**

2
win32.mak
View file

@ -43,7 +43,7 @@ DRUNTIMELIB=$(DRUNTIME)\lib\druntime.lib
## Flags for dmd D compiler ## Flags for dmd D compiler
DFLAGS=-conf= -O -release -w -dip25 -I$(DRUNTIME)\import DFLAGS=-conf= -O -release -w -de -dip25 -I$(DRUNTIME)\import
#DFLAGS=-unittest -g #DFLAGS=-unittest -g
#DFLAGS=-unittest -cov -g #DFLAGS=-unittest -cov -g

2
win64.mak
View file

@ -46,7 +46,7 @@ DRUNTIMELIB=$(DRUNTIME)\lib\druntime$(MODEL).lib
## Flags for dmd D compiler ## Flags for dmd D compiler
DFLAGS=-conf= -m$(MODEL) -O -release -w -dip25 -I$(DRUNTIME)\import DFLAGS=-conf= -m$(MODEL) -O -release -w -de -dip25 -I$(DRUNTIME)\import
#DFLAGS=-m$(MODEL) -unittest -g #DFLAGS=-m$(MODEL) -unittest -g
#DFLAGS=-m$(MODEL) -unittest -cov -g #DFLAGS=-m$(MODEL) -unittest -cov -g