Skip to content

Commit a0c3f1e

Browse files
MartinNowakMartinNowak
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents 4344d59 + 007e845 commit a0c3f1e

File tree

297 files changed

+18270
-19348
lines changed

Some content is hidden

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

297 files changed

+18270
-19348
lines changed

‎.circleci/run.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -uexo pipefail
44

5-
HOST_DMD_VER=2.072.2 # same as in dmd/src/posix.mak
5+
HOST_DMD_VER=2.078.1
66
CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
77
DUB=${DUB:-$HOME/dlang/dub/dub}
88
N=2
@@ -108,7 +108,8 @@ run_make()
108108
export PATH="$(pwd)/make:$PATH"
109109
make -v
110110
111-
make -f posix.mak RELEASE=1 release -j5 html dmd-release druntime-release phobos-release d-release.tag
111+
# -j1 is used for a better error log
112+
make -f posix.mak -j1 RELEASE=1 DIFFABLE=1 release
112113
}
113114
114115
case $1 in

‎.gitignore

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
!appendices.html
2-
!articles.html
3-
!dcompiler.html
4-
!howtos.html
5-
!debugger.html
6-
!language-reference.html
71
*.html
82

93
Thumbs.db
@@ -19,9 +13,6 @@ Thumbs.db
1913
images/*.pdf
2014

2115
/web
22-
Makefile
23-
css/cssmenu.css
24-
*.min.*
2516

2617
.dub/
2718
dpl-docs/dpl-docs

‎.htaccess

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ RewriteBase /
1818

1919
RewriteRule ^(phobos(-prerelease)?/std_container)_package\.html $1.html [R=301,L]
2020

21+
Redirect 301 /appendices.html https://dlang.org/dstyle.html
2122
Redirect 301 /COM.html http://wiki.dlang.org/COM_Programming
2223
Redirect 301 /dll.html http://wiki.dlang.org/Win32_DLLs_in_D
24+
Redirect 301 /how-tos.html https://wiki.dlang.org/Tutorials
2325
Redirect 301 /htomodule.html http://wiki.dlang.org/Converting_C_.h_Files_to_D_Modules
26+
Redirect 301 /language-reference.html https://dlang.org/spec/spec.html
2427
Redirect 301 /memory.html http://wiki.dlang.org/Memory_Management
2528
Redirect 301 /windows.html http://wiki.dlang.org/D_for_Win32
2629
Redirect 301 /getstarted.html http://wiki.dlang.org/Getting_Started
@@ -56,5 +59,41 @@ cpp_interface|objc_interface|portability|entity|memory-safe-d|abi|simd)\
5659
(\.html)?$ \
5760
spec/$1.html [R=301,L]
5861

62+
# Foundation pages
63+
Redirect 301 /foundation_overview.html https://dlang.org/foundation/index.html
64+
Redirect 301 /foundation.html https://dlang.org/foundation/about.html
65+
Redirect 301 /contributors.html https://dlang.org/foundation/contributors.html
66+
Redirect 301 /sponsors.html https://dlang.org/foundation/sponsors.html
67+
Redirect 301 /dlangupb-scholarship.html https://dlang.org/foundation/updscholarship.html
68+
Redirect 301 /donate.html https://dlang.org/foundation/donate.html
69+
70+
# Legacy article pages
71+
Redirect 301 /articles.html /articles/index.html
72+
Redirect 301 /builtin.html /articles/builtin.html
73+
Redirect 301 /code_coverage.html /articles/code_coverage.html
74+
Redirect 301 /const-faq.html /articles/const-faq.html
75+
Redirect 301 /cppcontracts.html /articles/cppcontracts.html
76+
Redirect 301 /cpptod.html /articles/cpptod.html
77+
Redirect 301 /ctarguments.html /articles/ctarguments.html
78+
Redirect 301 /ctod.html /articles/ctod.html
79+
Redirect 301 /d-array-article.html /articles/d-array-article.html
80+
Redirect 301 /d-floating-point.html /articles/d-floating-point.html
81+
Redirect 301 /dll-linux.html /articles/dll-linux.html
82+
Redirect 301 /exception-safe.html /articles/exception-safe.html
83+
Redirect 301 /faq.html /articles/faq.html
84+
Redirect 301 /hijack.html /articles/hijack.html
85+
Redirect 301 /intro-to-datetime.html /articles/intro-to-datetime.html
86+
Redirect 301 /lazy-evaluation.html /articles/lazy-evaluation.html
87+
Redirect 301 /migrate-to-shared.html /articles/migrate-to-shared.html
88+
Redirect 301 /mixin.html /articles/mixin.html
89+
Redirect 301 /pretod.html /articles/pretod.html
90+
Redirect 301 /regular-expression.html /articles/regular-expression.html
91+
Redirect 301 /safed.html /articles/safed.html
92+
Redirect 301 /template-comparison.html /articles/template-comparison.html
93+
Redirect 301 /templates-revisited.html /articles/templates-revisited.html
94+
Redirect 301 /variadic-function-templates.html /articles/variadic-function-templates.html
95+
Redirect 301 /warnings.html /articles/warnings.html
96+
Redirect 301 /rationale.html /articles/rationale.html
97+
5998
# Error pages
6099
ErrorDocument 404 /404.html

‎404.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $(D_S 404 Not Found,
55
$(P
66
Page not found!
77

8-
If you think there should be something here, please use the "Report a bug" link above to let us know.
8+
If you think there should be something here, please $(LINK2 $(BUGZILLA_NEW_BUG_URL)$(AMP)bug_severity=normal, report a bug).
99
))
1010

1111
Macros:

‎CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,7 @@ be present in `$R`: `dlang.org`, `dmd`, `dmd-2.083.2`, `druntime-2.083.2`, and
9595
should be the same for all three directories.
9696

9797
The output is in `web/phobos` and `web/library`.
98+
99+
### Learning more about DDoc
100+
101+
Please see the [Ddoc fundamentals](https://wiki.dlang.org/Contributing_to_dlang.org).

‎D1toD2.dd

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ Ddoc
22

33
$(D_S $(TITLE),
44

5-
$(P There are many changes to the D programming language that affect
6-
migrating source code from D1 to D2.
7-
This is an outline of changes to look for and a guide to how to modify
8-
the code.
9-
)
5+
$(P There are many changes to the D programming language that affect
6+
migrating source code from D1 to D2.
7+
This is an outline of changes to look for and a guide to how to modify
8+
the code.
9+
)
1010

11-
$(P This document is incomplete.)
11+
$(P This document is incomplete.)
1212

1313
$(UL
1414
$(LI Core Language
1515
$(UL
16-
$(ITEMR new_keywords, New Keywords)
17-
$(ITEMR global_variables, Global Variables)
18-
$(ITEMR static_arrays, Static Arrays are now Value Types)
19-
$(ITEMR immutable_string, String Literals are Immutable)
16+
$(ITEMR new_keywords, New Keywords)
17+
$(ITEMR global_variables, Global Variables)
18+
$(ITEMR static_arrays, Static Arrays are now Value Types)
19+
$(ITEMR immutable_string, String Literals are Immutable)
2020
)
2121
)
2222

@@ -28,46 +28,46 @@ $(UL
2828

2929
$(ITEM new_keywords, New Keywords)
3030

31-
$(P D2 adds the following keywords:
32-
$(D_KEYWORD pure),
33-
$(D_KEYWORD nothrow),
34-
$(D_KEYWORD shared), and
35-
$(D_KEYWORD immutable).
36-
Any use of them in D1 code must be renamed.
37-
Any variable names starting with two underscores
38-
should be renamed.
39-
)
31+
$(P D2 adds the following keywords:
32+
$(D_KEYWORD pure),
33+
$(D_KEYWORD nothrow),
34+
$(D_KEYWORD shared), and
35+
$(D_KEYWORD immutable).
36+
Any use of them in D1 code must be renamed.
37+
Any variable names starting with two underscores
38+
should be renamed.
39+
)
4040

4141
$(ITEM global_variables, Global Variables)
4242

43-
$(P Global variables are now, by default, stored in thread local
44-
storage. To put them back in global storage, use the $(D_KEYWORD __gshared)
45-
storage class:)
43+
$(P Global variables are now, by default, stored in thread local
44+
storage. To put them back in global storage, use the $(D_KEYWORD __gshared)
45+
storage class:)
4646

4747
---
4848
int foo = 7; // D1 code
4949
$(B __gshared) int foo = 7; // D2 equivalent
5050
---
5151

52-
$(P Carefully consider whether or not those variables actually should
53-
go into thread local storage, rather than being implicitly shared
54-
among all threads.
55-
)
52+
$(P Carefully consider whether or not those variables actually should
53+
go into thread local storage, rather than being implicitly shared
54+
among all threads.
55+
)
5656

5757
$(ITEM static_arrays, Static Arrays are now Value Types)
5858

59-
$(P In D1, a static array function parameter is passed by
60-
reference, meaning a pointer to the start of the static array
61-
is passed as an argument.
62-
This means that any changes to the array contents made by the
63-
function will be visible to the function's caller.
64-
In D2, a copy of the whole static
65-
array is passed as an argument. Changes to the array contents by
66-
the function are not visible to the function's caller, as it is
67-
a separate copy.)
59+
$(P In D1, a static array function parameter is passed by
60+
reference, meaning a pointer to the start of the static array
61+
is passed as an argument.
62+
This means that any changes to the array contents made by the
63+
function will be visible to the function's caller.
64+
In D2, a copy of the whole static
65+
array is passed as an argument. Changes to the array contents by
66+
the function are not visible to the function's caller, as it is
67+
a separate copy.)
6868

69-
$(P To migrate, add the keyword $(D_KEYWORD ref) to the parameter
70-
declaration:)
69+
$(P To migrate, add the keyword $(D_KEYWORD ref) to the parameter
70+
declaration:)
7171

7272
---
7373
void foo(int[3] array); // D1 code
@@ -76,26 +76,26 @@ void foo($(B ref) int[3] array); // D2 equivalent
7676

7777
$(ITEM immutable_string, String Literals are Immutable)
7878

79-
$(P String literals in D1 have type $(D char[]), but in D2 they
80-
have type $(D immutable(char)[]), which is aliased for convenience
81-
under the name $(D string). To migrate usually involves doing a
82-
global search replace: )
79+
$(P String literals in D1 have type $(D char[]), but in D2 they
80+
have type $(D immutable(char)[]), which is aliased for convenience
81+
under the name $(D string). To migrate usually involves doing a
82+
global search replace: )
8383

84-
$(TABLE
85-
$(TR $(TH from)$(TH to))
86-
$(TR $(TD char[])$(TD string))
87-
$(TR $(TD wchar[])$(TD wstring))
88-
$(TR $(TD dchar[])$(TD dstring))
89-
)
84+
$(TABLE
85+
$(TR $(TH from)$(TH to))
86+
$(TR $(TD char[])$(TD string))
87+
$(TR $(TD wchar[])$(TD wstring))
88+
$(TR $(TD dchar[])$(TD dstring))
89+
)
9090

91-
$(P This will take care of most of the issues.
92-
For the rest, where mutable strings are desired, there will
93-
be some work necessary.
94-
)
91+
$(P This will take care of most of the issues.
92+
For the rest, where mutable strings are desired, there will
93+
be some work necessary.
94+
)
9595

9696
)
9797

9898
Macros:
99-
TITLE=Migrating D1 Code to D2
100-
ITEMR=$(LI $(RELATIVE_LINK2 $1, $+))
101-
ITEM=$(HR)$(H3 $(ADEF $1)$+)
99+
TITLE=Migrating D1 Code to D2
100+
ITEMR=$(LI $(RELATIVE_LINK2 $1, $+))
101+
ITEM=$(HR)$(H3 $(ADEF $1)$+)

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
![D Logo](https://dlang.org/images/dlogo.svg) D Language Website
22
===============================================================
33

4-
[![GitHub tag](https://img.shields.io/github/tag/dlang/dlang.org.svg?maxAge=86400)](#)
4+
[![GitHub tag](https://img.shields.io/github/tag/dlang/dlang.org.svg?maxAge=86400)](https://github.com/dlang/dlang.org/releases)
55
[![Issue Stats](https://img.shields.io/issuestats/p/github/dlang/dlang.org.svg?maxAge=2592000)](http://www.issuestats.com/github/dlang/dlang.org)
6+
[![license](https://img.shields.io/github/license/dlang/dlang.org.svg)](https://github.com/dlang/dlang.org/blob/master/LICENSE.txt)
67

78
This repository contains the source files for the [D Language
89
Website](https://dlang.org), including the language specifications,

‎acknowledgements.dd

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,43 @@ and moral support.
1010
)
1111

1212
$(P
13-
$(LINK2 http://erdani.org/, Andrei Alexandrescu),
14-
Kris Bell,
15-
Don Clugston,
16-
Hauke Duden,
17-
Bruce Eckel,
18-
Eric Engstrom,
19-
Dave Fladebo,
20-
David Friedman,
21-
Stewart Gordon,
13+
$(LINK2 http://erdani.org/, Andrei Alexandrescu),
14+
Kris Bell,
15+
Don Clugston,
16+
Hauke Duden,
17+
Bruce Eckel,
18+
Eric Engstrom,
19+
Dave Fladebo,
20+
David Friedman,
21+
Stewart Gordon,
2222
Kenji Hara,
23-
Christian Hartung,
24-
David Held,
25-
Ben Hinkle,
26-
Kazuhiro Inaba,
27-
$(LINK2 http://www.janknepper.com, Jan Knepper),
28-
Thomas Kuehne,
29-
Helmut Leitner,
30-
Lubomir Litchev,
31-
$(LINK2 http://www.relisoft.com/, Bartosz Milewski),
32-
Christopher E. Miller,
33-
Pavel Minayev,
34-
Antonio Monteiro,
35-
Paul Nash,
36-
Pat Nelson,
37-
Derek Parnell,
38-
Burton Radons,
39-
Tim Rentsch,
40-
Fabio Riccardi,
41-
Brad Roberts,
42-
Bob Taniguchi,
43-
Bob W,
44-
John Whited,
45-
Matthew Wilson,
46-
Peter Zatloukal
23+
Christian Hartung,
24+
David Held,
25+
Ben Hinkle,
26+
Kazuhiro Inaba,
27+
$(LINK2 http://www.janknepper.com, Jan Knepper),
28+
Thomas Kuehne,
29+
Helmut Leitner,
30+
Lubomir Litchev,
31+
$(LINK2 http://www.relisoft.com/, Bartosz Milewski),
32+
Christopher E. Miller,
33+
Pavel Minayev,
34+
Antonio Monteiro,
35+
Paul Nash,
36+
Pat Nelson,
37+
Derek Parnell,
38+
Burton Radons,
39+
Tim Rentsch,
40+
Fabio Riccardi,
41+
Brad Roberts,
42+
Bob Taniguchi,
43+
Bob W,
44+
John Whited,
45+
Matthew Wilson,
46+
Peter Zatloukal
4747
)
4848
)
4949

5050
Macros:
51-
TITLE=Acknowledgements
51+
TITLE=Acknowledgements
5252

‎appendices.html

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)