Merge branch 'master' into query-stats

Author: thewilsonator

.circleci/config.yml

@@ -7,12 +7,12 @@ jobs:
     parallelism: 2
     steps:
       - checkout
-      - run:
-          command: ./.circleci/run.sh install-deps
-          name: Install DMD
       - run:
           command: ./.circleci/run.sh setup-repos
           name: Clone DMD
+      - run:
+          command: ./.circleci/run.sh install-deps
+          name: Install DMD
       - run:
           command: ./.circleci/run.sh style
           name: Check code style

.circleci/run.sh

@@ -2,7 +2,7 @@
 
 set -uexo pipefail
 
-HOST_DMD_VER=2.072.2 # same as in dmd/src/posix.mak
+HOST_DMD_VER=2.079.1
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 N=4
 CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
@@ -31,10 +31,11 @@ download() {
 }
 
 install_deps() {
+    sudo apt-get update
     if [ $MODEL -eq 32 ]; then
-        sudo apt-get update
-        sudo apt-get install g++-multilib
+        sudo apt-get install -y g++-multilib
     fi
+    sudo apt-get install -y gdb
 
     download "https://dlang.org/install.sh" "https://nightlies.dlang.org/install.sh" "install.sh"
 

.editorconfig

@@ -1,7 +1,6 @@
 root = true
 
-[*.{c,h,d,di,dd}]
-end_of_line = lf
+[*.{c,cpp,h,d,di,dd}]
 insert_final_newline = true
 indent_style = space
 indent_size = 4

CODEOWNERS

@@ -35,7 +35,6 @@ src/core/sys/linux/* @Burgos @redstar @MartinNowak
 src/core/sys/netbsd/* @nrTQgc @joakim-noah
 src/core/sys/dragonflybsd/* @dkgroot
 src/core/sys/openbsd/* @redstar
-src/core/sys/osx/* @jacob-carlborg @klickverbot @etcimon @MartinNowak
 src/core/sys/posix/* @CyberShadow @MartinNowak @joakim-noah @redstar
 src/core/sys/solaris/* @redstar
 src/core/sys/windows/* @CyberShadow

README.md

@@ -3,7 +3,7 @@ DRuntime: Runtime Library for the D Programming Language
 
 [![GitHub tag](https://img.shields.io/github/tag/dlang/druntime.svg?maxAge=86400)](https://github.com/dlang/druntime/releases)
 [![Bugzilla Issues](https://img.shields.io/badge/issues-Bugzilla-green.svg)](https://issues.dlang.org/buglist.cgi?component=druntime&list_id=220148&product=D&resolution=---)
-[![Build status](https://img.shields.io/circleci/project/dlang/druntime.svg?maxAge=86400)](https://circleci.com/gh/dlang/druntime)
+[![CircleCI](https://circleci.com/gh/dlang/druntime/tree/master.svg?style=svg)](https://circleci.com/gh/dlang/druntime/tree/master)
 [![Code coverage](https://img.shields.io/codecov/c/github/dlang/druntime.svg?maxAge=86400)](https://codecov.io/gh/dlang/druntime)
 [![Issue Stats](https://img.shields.io/issuestats/p/github/dlang/druntime.svg?maxAge=2592000)](http://www.issuestats.com/github/dlang/druntime)
 [![license](https://img.shields.io/github/license/dlang/druntime.svg)](https://github.com/dlang/druntime/blob/master/LICENSE.txt)

benchmark/arrayops/arrayops.d

@@ -5,8 +5,8 @@
  * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Authors:   Martin Nowak
  */
-import core.cpuid, std.algorithm, std.datetime, std.meta, std.stdio, std.string,
-    std.range;
+import core.cpuid, std.algorithm, std.meta, std.stdio, std.string, std.range;
+import std.datetime.stopwatch : benchmark, StopWatch, AutoStart;
 
 float[6] getLatencies(T, string op)()
 {
@@ -33,7 +33,7 @@ float[6] getLatencies(T, string op)()
                     .replace("c", "c[off .. off + len]");
                 mixin(op ~ ";");
             }
-            latency = min(latency, sw.peek.nsecs);
+            latency = min(latency, sw.peek.total!"nsecs");
         }
     }
     float[6] res = latencies[] / 1024;
@@ -69,7 +69,7 @@ float[4] getThroughput(T, string op)()
                     .replace("c", "c[off .. off + len]");
                 mixin(op ~ ";");
             }
-            immutable nsecs = sw.peek.nsecs;
+            immutable nsecs = sw.peek.total!"nsecs";
             runMasked({latency = min(latency, nsecs);});
         }
     }

benchmark/gcbench/conmsg.d

@@ -7,7 +7,7 @@
  */
 import std.algorithm, std.concurrency, std.conv, std.file, std.json, std.range;
 
-JSONValue buildVal(in dchar[] word)
+JSONValue buildVal(in dchar[] word) pure
 {
     JSONValue[string] res;
     res["word"] = word.to!string;
@@ -35,27 +35,27 @@ void producer(Tid consumer)
 
 void serialize(in JSONValue val, ref ubyte[] buf)
 {
-    with (JSON_TYPE) switch (val.type)
+    with (JSONType) switch (val.type)
     {
-    case OBJECT:
+    case object:
         foreach (k, v; val.object)
         {
             buf ~= cast(ubyte[])k;
             serialize(v, buf);
         }
         break;
 
-    case ARRAY:
+    case array:
         foreach (v; val.array)
             serialize(v, buf);
         break;
 
-    case UINTEGER:
+    case uinteger:
         ulong v = val.uinteger;
         buf ~= (cast(ubyte*)&v)[0 .. v.sizeof];
         break;
 
-    case STRING:
+    case string:
         buf ~= cast(ubyte[])val.str;
         break;
 

changelog/array.dd

@@ -0,0 +1,3 @@
+Added `core.stdcpp.array`.
+
+Added `core.stdcpp.array`, which links against C++ `std::array`