Merge remote-tracking branch 'upstream/master' into merge_master

Jenkinsfile

@@ -15,7 +15,7 @@ def clone (repo_url, git_ref = "master") {
 def pipeline
 node {
     dir('dlang/ci') {
-        clone 'https://github.com/Dicebot/dlangci.git', 'master'
+        clone 'https://github.com/dlang/ci.git', 'master'
     }
     pipeline = load 'dlang/ci/pipeline.groovy'
 }

changelog/pattern-deprecate.dd

@@ -0,0 +1,10 @@
+Several functions in `std.string` have been deprecated
+
+The functions $(REF inPattern, std, string), $(REF countchars, std, string),
+$(REF removechars, std, string), $(REF squeeze, std, string), and
+$(REF munch, std, string), have all been deprecated. These functions are
+obsolete, as their functionality is better covered by the functions in
+$(MREF std, regex) and $(MREF std, algorithm). They will be removed from
+$(MREF std, string) on May 2018.
+
+If you still need to use these, please see $(LINK2 https://github.com/dlang/undeaD, undeaD).

changelog/split-std-datetime.dd

@@ -0,0 +1,54 @@
+std.datetime has been split into a package.
+
+std.datetime is now a package containing the following modules:
+
+$(UL
+    $(LI $(MREF std,datetime,date))
+    $(LI $(MREF std,datetime,interval))
+    $(LI $(MREF std,datetime,stopwatch))
+    $(LI $(MREF std,datetime,systime))
+    $(LI $(MREF std,datetime,timezone))
+)
+
+$(MREF std,datetime,package) publicly imports all of those modules. So, it
+should be the case that no existing code will break, as everything in
+std.datetime will still be imported by importing std.datetime. New code can
+choose to import the modules individually or to import the entire package.
+
+$(MREF std,datetime,date) contains Date, TimeOfDay, DateTime, and the related
+free functions. It also contains DateTimeException.
+
+$(MREF std,datetime,interval) contains the *Interval and *IntervalRange types
+as well as the related free functions.
+
+$(MREF std,datetime,systime) contains SysTime and the related free functions.
+
+$(MREF std,datetime,timezone) contains the time zone types.
+
+$(MREF std,datetime,package) contains StopWatch and the benchmarking functions
+(so, they can only be imported via std.datetime and not via a submodule). As
+those functions use $(REF TickDuration,core,time) (which is being replaced by
+$(REF MonoTime,core,time), they are slated for deprecation.
+
+$(MREF std,datetime,stopwatch) has been added. It contains versions of
+StopWatch and benchmark which have almost the same API as the existing symbols,
+but they use $(REF MonoTime,core,time) and $(REF Duration,core,time) instead of
+$(REF TickDuration,core,time). In the next major release, the old functions in
+std.datetime.package will be deprecated, so code which uses the old
+benchmarking functions should be updated to use std.datetime.stopwatch.
+
+However, note that in order to avoid irreconcilable symbol conflicts between
+the new and old versions, std.datetime.stopwatch will not be publicly imported
+by std.datetime.package until the old symbols have been removed. So, for the
+time being, code using $(REF StopWatch,std,datetime,stopwatch) or
+$(REF StopWatch,std,datetime,benchmark) will need to import
+std.datetime.stopwatch directly. Code which imports both std.datetime and
+std.datetime.stopwatch will need to either use selective imports or fully
+qualified symbols to reconcile the symbol conflicts, but no code will be
+affected by the changes until it's updated to import std.datetime.stopwatch,
+and when the old symbols are finally removed, the selective imports and fully
+qualified paths to the new symbols will continue to work and won't break
+(though at that point, simply importing std.datetime will work, since
+std.datetime.package will have been updated to publicly import
+std.datetime.stopwatch). Code that simply imporst std.datetime.stopwatch without
+importing std.datetime will not have to worry about symbol conflicts.

changelog/std-digest-crc64.dd

@@ -0,0 +1,16 @@
+Added support for 64 bit CRC
+
+Support for both ISO and ECMA 64 bit CRC was added to $(MREF std, digest, crc).
+
+-------
+import std.digest.crc;
+
+void main()
+{
+    ubyte[8] hash64ecma = crc64ECMAOf("abc");
+    assert(crcHexString(hash64ecma) == "2CD8094A1A277627");
+
+    ubyte[8] hash64iso = crc64ISOOf("abc");
+    assert(crcHexString(hash64iso) == "3776C42000000000");
+}
+-------

changelog/std-digest-digest-secureCompare.dd

@@ -0,0 +1,29 @@
+Added a constant time comparison function for cryptographic hashes
+
+Added a new function to $(REF secureEqual, std, digest, digest) that compares
+two ranges that represent hashes in a secure manner. The comparison is done in
+constant time regardless of the equality of the two ranges in order to protect
+against timing attacks. For more information on the attack, please refer to
+the docs on $(REF secureEqual, std, digest, digest).
+
+-----
+import std.digest.digest : secureEqual, toHexString;
+import std.digest.hmac : hmac;
+import std.digest.sha : SHA1;
+import std.string : representation;
+
+void main()
+{
+    // a typical HMAC data integrity verification
+    auto secret = "A7GZIP6TAQA6OHM7KZ42KB9303CEY0MOV5DD6NTV".representation;
+    auto data = "data".representation;
+
+    string hex1 = data.hmac!SHA1(secret).toHexString;
+    string hex2 = data.hmac!SHA1(secret).toHexString;
+
+    string hex3 = "data1".representation.hmac!SHA1(secret).toHexString;
+
+    assert( secureEqual(hex1, hex2));
+    assert(!secureEqual(hex1, hex3));
+}
+-----

changelog/std-range-has-length.dd

@@ -0,0 +1,8 @@
+`hasLength` now enforces that `length` has type `size_t`
+
+Historically `hasLength!R` yielded `true` for types whereby
+`R.length` returns other types convertible to `ulong`, such as `int`, `ushort`,
+`const(size_t)`, user-defined types using `alias this`, or notably `ulong` on
+32-bit systems. This behavior has  been deprecated. After December 2017,
+$(REF hasLength, std, range, primitives) will yield `true` only if `R.length`
+yields the exact type `size_t`.

changelog/std-range-slides.dd

@@ -0,0 +1,33 @@
+`std.range.slide` (a fixed-size sliding window range) was added
+
+$(REF slide, std, range) allows to iterate a range in sliding windows:
+
+---
+import std.array : array;
+import std.algorithm.comparison : equal;
+
+assert([0, 1, 2, 3].slide(2).equal!equal(
+    [[0, 1], [1, 2], [2, 3]]
+));
+assert(5.iota.slide(3).equal!equal(
+    [[0, 1, 2], [1, 2, 3], [2, 3, 4]]
+));
+
+assert(iota(7).slide(2, 2).equal!equal([[0, 1], [2, 3], [4, 5]]));
+assert(iota(12).slide(2, 4).equal!equal([[0, 1], [4, 5], [8, 9]]));
+
+// set a custom stepsize (default 1)
+assert(6.iota.slide(1, 2).equal!equal(
+    [[0], [2], [4]]
+));
+
+assert(6.iota.slide(2, 4).equal!equal(
+    [[0, 1], [4, 5]]
+));
+
+// allow slide with less elements than the window size
+assert(3.iota.slide!(No.withFewerElements)(4).empty);
+assert(3.iota.slide!(Yes.withFewerElements)(4).equal!equal(
+    [[0, 1, 2]]
+));
+---

circle.yml

@@ -7,7 +7,9 @@ dependencies:
 test:
   override:
     - ./circleci.sh setup-repos
-    - ./circleci.sh style
+    - ./circleci.sh style_lint
+    - ./circleci.sh has_public_example
+    - ./circleci.sh publictests
     - ./circleci.sh coverage:
         parallel: true
         timeout: 1200

circleci.sh

@@ -95,7 +95,7 @@ setup_repos()
 }
 
 # verify style guide
-style()
+style_lint()
 {
     # dscanner needs a more up-to-date DMD version
     source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$DSCANNER_DMD_VER --activate)"
@@ -105,7 +105,7 @@ style()
     # fix to a specific version of https://github.com/dlang/tools/tree/master/styles
     git -C ../tools checkout 60583c8363ff25d00017dffdb18c7ee7e7d9a343
 
-    make -f posix.mak style DUB=$DUB
+    make -f posix.mak style_lint DUB=$DUB
 }
 
 # run unittest with coverage
@@ -121,11 +121,30 @@ coverage()
 
     # instead we run all tests individually
     make -f posix.mak $(find std etc -name "*.d" | sed "s/[.]d$/.test")
+
+    # Remove coverage information from lines with non-deterministic coverage.
+    # These lines are annotated with a comment containing "nocoverage".
+    sed -i 's/^ *[0-9]*\(|.*nocoverage.*\)$/       \1/' ./*.lst
+}
+
+# extract publictests and run them independently
+publictests()
+{
+    make -f posix.mak -j$N publictests DUB=$DUB
+}
+
+# check modules for public unittests
+has_public_example()
+{
+    make -f posix.mak -j$N has_public_example DUB=$DUB
 }
 
 case $1 in
     install-deps) install_deps ;;
     setup-repos) setup_repos ;;
     coverage) coverage ;;
-    style) style ;;
+    publictests) publictests ;;
+    has_public_example) has_public_example;;
+    style_lint) style_lint ;;
+    *) echo "Unknown command"; exit 1;;
 esac

etc/c/curl.d

@@ -35,8 +35,8 @@
 
 module etc.c.curl;
 
-import core.stdc.time;
 import core.stdc.config;
+import core.stdc.time;
 import std.socket;
 
 // linux

index.d

@@ -461,7 +461,6 @@ $(COMMENT
     $(TR
         $(TDNW
             $(LINK2 core_sync_config.html, core.sync.config)$(BR)
-            $(LINK2 std_concurrencybase.html, std.concurrencybase)$(BR)
             $(LINK2 std_container_util.html, std.container.util)$(BR)
             $(LINK2 std_regex_internal_backtracking.html, std.regex.internal.backtracking)$(BR)
             $(LINK2 std_regex_internal_generator.html, std.regex.internal.generator)$(BR)
@@ -470,7 +469,6 @@ $(COMMENT
             $(LINK2 std_regex_internal_parser.html, std.regex.internal.parser)$(BR)
             $(LINK2 std_regex_internal_tests.html, std.regex.internal.tests)$(BR)
             $(LINK2 std_regex_internal_thompson.html, std.regex.internal.thompson)$(BR)
-            $(LINK2 std_stdiobase.html, std.stdiobase)$(BR)
         )
         $(TD
              Internal modules.