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

Commit 0bb71a3

Browse files
MartinNowakMartinNowak
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents ca4b837 + 7b4172e commit 0bb71a3

File tree

189 files changed

+4912
-4209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+4912
-4209
lines changed

‎.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
root = true
22

33
[*.{c,h,d,di,dd}]
4-
end_of_line = lf
54
insert_final_newline = true
65
indent_style = space
76
indent_size = 4

‎benchmark/arrayops/arrayops.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
66
* Authors: Martin Nowak
77
*/
8-
import core.cpuid, std.algorithm, std.datetime, std.meta, std.stdio, std.string,
9-
std.range;
8+
import core.cpuid, std.algorithm, std.meta, std.stdio, std.string, std.range;
9+
import std.datetime.stopwatch : benchmark, StopWatch, AutoStart;
1010

1111
float[6] getLatencies(T, string op)()
1212
{
@@ -33,7 +33,7 @@ float[6] getLatencies(T, string op)()
3333
.replace("c", "c[off .. off + len]");
3434
mixin(op ~ ";");
3535
}
36-
latency = min(latency, sw.peek.nsecs);
36+
latency = min(latency, sw.peek.total!"nsecs");
3737
}
3838
}
3939
float[6] res = latencies[] / 1024;
@@ -69,7 +69,7 @@ float[4] getThroughput(T, string op)()
6969
.replace("c", "c[off .. off + len]");
7070
mixin(op ~ ";");
7171
}
72-
immutable nsecs = sw.peek.nsecs;
72+
immutable nsecs = sw.peek.total!"nsecs";
7373
runMasked({latency = min(latency, nsecs);});
7474
}
7575
}

‎mak/COPY

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ COPY=\
8686
$(IMPDIR)\core\sys\freebsd\sys\mount.d \
8787
$(IMPDIR)\core\sys\freebsd\sys\mman.d \
8888
$(IMPDIR)\core\sys\freebsd\time.d \
89+
$(IMPDIR)\core\sys\freebsd\unistd.d \
8990
\
9091
$(IMPDIR)\core\sys\dragonflybsd\dlfcn.d \
9192
$(IMPDIR)\core\sys\dragonflybsd\execinfo.d \
@@ -171,6 +172,7 @@ COPY=\
171172
$(IMPDIR)\core\sys\posix\semaphore.d \
172173
$(IMPDIR)\core\sys\posix\setjmp.d \
173174
$(IMPDIR)\core\sys\posix\signal.d \
175+
$(IMPDIR)\core\sys\posix\spawn.d \
174176
$(IMPDIR)\core\sys\posix\stdio.d \
175177
$(IMPDIR)\core\sys\posix\stdlib.d \
176178
$(IMPDIR)\core\sys\posix\syslog.d \

‎mak/SRCS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ SRCS=\
7171
src\core\sys\freebsd\sys\mman.d \
7272
src\core\sys\freebsd\sys\mount.d \
7373
src\core\sys\freebsd\time.d \
74+
src\core\sys\freebsd\unistd.d \
7475
\
7576
src\core\sys\dragonflybsd\dlfcn.d \
7677
src\core\sys\dragonflybsd\execinfo.d \
@@ -101,6 +102,7 @@ SRCS=\
101102
\
102103
src\core\sys\posix\dirent.d \
103104
src\core\sys\posix\signal.d \
105+
src\core\sys\posix\spawn.d \
104106
src\core\sys\posix\netdb.d \
105107
src\core\sys\posix\netinet\in_.d \
106108
src\core\sys\posix\arpa\inet.d \

‎mak/WINDOWS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ $(IMPDIR)\core\sys\freebsd\sys\mman.d : src\core\sys\freebsd\sys\mman.d
277277
$(IMPDIR)\core\sys\freebsd\sys\mount.d : src\core\sys\freebsd\sys\mount.d
278278
copy $** $@
279279

280+
$(IMPDIR)\core\sys\freebsd\unistd.d : src\core\sys\freebsd\unistd.d
281+
copy $** $@
282+
280283
$(IMPDIR)\core\sys\dragonflybsd\dlfcn.d : src\core\sys\dragonflybsd\dlfcn.d
281284
copy $** $@
282285

@@ -508,6 +511,9 @@ $(IMPDIR)\core\sys\posix\setjmp.d : src\core\sys\posix\setjmp.d
508511
$(IMPDIR)\core\sys\posix\signal.d : src\core\sys\posix\signal.d
509512
copy $** $@
510513

514+
$(IMPDIR)\core\sys\posix\spawn.d : src\core\sys\posix\spawn.d
515+
copy $** $@
516+
511517
$(IMPDIR)\core\sys\posix\stdio.d : src\core\sys\posix\stdio.d
512518
copy $** $@
513519

‎posix.mak

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ UT_MODULES:=$(patsubst src/%.d,$(ROOT)/unittest/%,$(SRCS))
243243
HAS_ADDITIONAL_TESTS:=$(shell test -d test && echo 1)
244244
ifeq ($(HAS_ADDITIONAL_TESTS),1)
245245
ADDITIONAL_TESTS:=test/init_fini test/exceptions test/coverage test/profile test/cycles test/allocations test/typeinfo \
246+
test/aa test/hash \
246247
test/thread test/unittest test/imports test/betterc
247248
ADDITIONAL_TESTS+=$(if $(SHARED),test/shared,)
248249
endif
@@ -370,6 +371,12 @@ style_lint:
370371
@echo "Check for trailing whitespace"
371372
$(GREP) -nr '[[:blank:]]$$' $(MANIFEST) ; test $$? -eq 1
372373

374+
@echo "Enforce whitespace before opening parenthesis"
375+
$(GREP) -nrE "\<(for|foreach|foreach_reverse|if|while|switch|catch|version)\(" $$(find src -name '*.d') ; test $$? -eq 1
376+
377+
@echo "Enforce no whitespace after opening parenthesis"
378+
$(GREP) -nrE "\<(version) \( " $$(find src -name '*.d') ; test $$? -eq 1
379+
373380
.PHONY : auto-tester-build
374381
auto-tester-build: target checkwhitespace
375382

0 commit comments

Comments
 (0)