diff --git a/std/datetime/timezone.d b/std/datetime/timezone.d index ff5c1f7c463..8c968c57ce3 100644 --- a/std/datetime/timezone.d +++ b/std/datetime/timezone.d @@ -1994,41 +1994,37 @@ public: } - version(TZDatabaseDir) + version(StdDdoc) { - import std.string : strip; /++ - The default directory where the TZ Database files are. It's empty - for Windows, since Windows doesn't have them. + The default directory where the TZ Database files are stored. It's + empty for Windows, since Windows doesn't have them. You can also use + the TZDatabaseDir version to pass an arbitrary path at compile-time, + rather than hard-coding it here. Android concatenates all time zone + data into a single file called tzdata and stores it in the directory + below. +/ + enum defaultTZDatabaseDir = ""; + } + else version(TZDatabaseDir) + { + import std.string : strip; enum defaultTZDatabaseDir = strip(import("TZDatabaseDirFile")); } else version(Android) { - // Android concatenates all time zone data into a single file and stores it here. enum defaultTZDatabaseDir = "/system/usr/share/zoneinfo/"; } else version(Solaris) { - /++ - The default directory where the TZ Database files are. It's empty - for Windows, since Windows doesn't have them. - +/ enum defaultTZDatabaseDir = "/usr/share/lib/zoneinfo/"; } else version(Posix) { - /++ - The default directory where the TZ Database files are. It's empty - for Windows, since Windows doesn't have them. - +/ enum defaultTZDatabaseDir = "/usr/share/zoneinfo/"; } else version(Windows) { - /++ The default directory where the TZ Database files are. It's empty - for Windows, since Windows doesn't have them. - +/ enum defaultTZDatabaseDir = ""; } diff --git a/std/digest/murmurhash.d b/std/digest/murmurhash.d index 1fffc792510..4e9256a0a71 100644 --- a/std/digest/murmurhash.d +++ b/std/digest/murmurhash.d @@ -505,7 +505,7 @@ struct MurmurHash3(uint size /* 32 or 128 */ , uint opt = size_t.sizeof == 8 ? 6 // Buffer should never be full while entering this function. assert(bufferSize < Element.sizeof); - // Check if we don't fill up a whole block buffer. + // Check if the incoming data doesn't fill up a whole block buffer. if (bufferSize + data.length < Element.sizeof) { buffer.data[bufferSize .. bufferSize + data.length] = data[]; @@ -513,7 +513,8 @@ struct MurmurHash3(uint size /* 32 or 128 */ , uint opt = size_t.sizeof == 8 ? 6 return; } - // Check if we have some leftover data in the buffer. Then fill the first block buffer. + // Check if there's some leftover data in the first block buffer, and + // fill the remaining space first. if (bufferSize != 0) { const bufferLeeway = Element.sizeof - bufferSize;