Skip to content

Commit 9b902aa

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents e789166 + 9a1737a commit 9b902aa

File tree

13 files changed

+146
-135
lines changed

13 files changed

+146
-135
lines changed

areas-of-d-usage.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ $(AREA_SECTION3 $(LNAME2 data_science, Data science), $(ARTICLE_FA_ICON area-cha
212212
Read Adroll's testimonial
213213
$(HTTP tech.adroll.com/blog/data/2014/11/17/d-is-for-data-science.html, "D is for Data Science")
214214
on why D is a keystone language for their critical infrastructure.
215-
eBay recently open-sourced their internal $(HTTPS github.com/eBay/tsv-utils-dlang, data processing utilities)
215+
eBay recently open-sourced their internal $(HTTPS github.com/eBay/tsv-utils, data processing utilities)
216216
used in their large-scale data mining environment.
217217
))
218218

chm-nav.dd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ MENU={"t":"$2","a":"$1"},
5353
MENU_W_SUBMENU=[{"t":"$2"},
5454
MENU_W_SUBMENU_END=
5555
MENU_W_SUBMENU_LINK=[{"t":"$2","a":"$1"},
56+
MENU_INTERNAL_SEPARATOR=
5657
ITEMIZE=$(ITEMS_HELPER $1, $+)],
5758
ITEMS_HELPER = $1$(ITEMS_HELPER $+)
5859
SUBMENU=$(SUBMENU2 $1,$+)],

css/style.css

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2121,13 +2121,7 @@ dt.d_decl:hover .decl_anchor {
21212121
background-color: #4EBA0F;
21222122
}
21232123

2124-
/**
2125-
Custom modifications to the navigation menu
2126-
- Insert an Internal API divider before the dmd menu item
2127-
*/
2128-
.modlist-submenu-dmd::before{
2129-
content: "Internal API";
2130-
display: block;
2124+
.modlist-internal-separator {
21312125
height: 1em;
21322126
border-top: 1px solid #ccc;
21332127
margin-top: 1em;

dlang.org.ddoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ MENU = <li><a href='$1'><span>$+</span></a></li>
227227
MENU_W_SUBMENU = <li class='expand-container modlist-submenu-$1'><a class='expand-toggle' href='#'><span>$(TT $1)</span></a>
228228
MENU_W_SUBMENU_LINK = <li class='expand-container'><a class='expand-toggle' href='$1'><span>$+</span></a>
229229
MENU_W_SUBMENU_END = </li>
230+
MENU_INTERNAL_SEPARATOR = $(DIVC modlist-internal-separator, Internal API)
230231
MESSAGE_BOX = $(DIVC message-box message-box-$1, $+)
231232
META_KEYWORDS=D programming language
232233
META_DESCRIPTION=D Programming Language
@@ -261,6 +262,7 @@ $(SUBMENU_MANUAL
261262
$(SUBMENU_LINK $(ROOT_DIR)calendar.html, Calendar)
262263
$(SUBMENU_LINK_DIVIDER https://forum.dlang.org, Forums)
263264
$(SUBMENU_LINK irc://irc.freenode.net/d, IRC)
265+
$(SUBMENU_LINK https://discord.gg/bMZk9Q4, Community Discord)
264266
$(SUBMENU_LINK https://wiki.dlang.org, Wiki)
265267
$(SUBMENU_LINK_DIVIDER https://github.com/dlang, GitHub)
266268
$(SUBMENU_LINK $(ROOT_DIR)bugstats.html, Issues)

download.dd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,9 @@ $(DOWNLOAD_OTHER $(HOMEBREW), $(LINK2 http://brewformulas.org/Dmd, Homebrew), $(
181181
$(DOWNLOAD_OTHER $(NIX), Nix/NixOS, $(CONSOLE nix-env -i dmd))
182182

183183
$(DOWNLOAD_OTHER $(UBUNTU) $(DEBIAN), Ubuntu/Debian, $(LINK2 http://d-apt.sourceforge.net/, APT repository)
184-
$(CONSOLE sudo wget http://master.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
185-
sudo apt-get update && sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring
184+
$(CONSOLE sudo wget https://netcologne.dl.sourceforge.net/project/d-apt/files/d-apt.list -O /etc/apt/sources.list.d/d-apt.list
185+
sudo apt-get update --allow-insecure-repositories
186+
sudo apt-get -y --allow-unauthenticated install --reinstall d-apt-keyring
186187
sudo apt-get update && sudo apt-get install dmd-compiler dub)
187188
)
188189

dpl-docs/source/ddox_main.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ int cmdFilterDocs(string[] args)
176176
auto n = m["name"].get!string;
177177
bool include = true;
178178
foreach (ex; excluded)
179-
if (n.startsWith(ex)) {
179+
if (n == ex || n.startsWith(ex ~ ".")) {
180180
include = false;
181181
break;
182182
}
183183
foreach (inc; included)
184-
if (n.startsWith(inc)) {
184+
if (n == inc || n.startsWith(inc ~ ".")) {
185185
include = true;
186186
break;
187187
}

dpl-docs/views/layout.dt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ html(lang='en-US')
88
| https://dlang.org/foundation_overview.html
99
- import std.process : environment;
1010
- import std.array : replace;
11+
- import std.string : startsWith, endsWith;
1112
- static import std.string;
1213
- string version_id = environment["GIT_TARGET"];
1314
- bool noExactSourceCodeLinks = environment["NO_EXACT_SOURCE_CODE_LINKS"] == "1";

orgs-using-d.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ $(DIVC orgs-using-d center,
8383
Large scale data mining tools.
8484
$(HTTPS dlang.org/blog/2017/05/24/faster-command-line-tools-in-d/, Command line tools in D)
8585
$(LINK_ROW
86-
$(FA_GITHUB eBay/tsv-utils-dlang)
86+
$(FA_GITHUB eBay/tsv-utils)
8787
)
8888
)
8989
$(DORG ecratum, http://www.ecratum.com, ecratum.png,

posix.mak

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ DRUNTIME_LATEST_DIR=$G/druntime-${LATEST}
180180
PHOBOS_LATEST_DIR=$G/phobos-${LATEST}
181181

182182
# stable dub and dmd versions used to build dpl-docs
183-
STABLE_DMD_VER=2.085.0
183+
STABLE_DMD_VER=2.088.0
184184
STABLE_DMD_VER_SUFFIX=
185185
STABLE_DMD_VER_PREFIX=
186186
STABLE_DMD_ROOT=$(GENERATED)/stable_dmd-$(STABLE_DMD_VER)$(STABLE_DMD_VER_SUFFIX)
@@ -193,8 +193,8 @@ DUB=$(STABLE_DMD_BIN_ROOT)/dub
193193

194194
# exclude lists
195195
MOD_EXCLUDES_PRERELEASE=$(addprefix --ex=, \
196-
core.internal. core.stdc.config core.sys. \
197-
std.algorithm.internal std.c. std.internal. std.regex.internal. \
196+
core.internal core.stdc.config core.sys \
197+
std.algorithm.internal std.c std.internal std.regex.internal \
198198
std.digest.digest \
199199
std.windows.registry etc.linux.memoryerror \
200200
std.typetuple \
@@ -205,6 +205,7 @@ MOD_EXCLUDES_PRERELEASE=$(addprefix --ex=, \
205205
dmd.scanmach dmd.scanmscoff)
206206

207207
MOD_EXCLUDES_LATEST=$(MOD_EXCLUDES_PRERELEASE)
208+
MOD_EXCLUDES_RELEASE=$(MOD_EXCLUDES_PRERELEASE)
208209

209210
# rdmd must fetch the model, imports, and libs from the specified version
210211
DFLAGS=-m$(MODEL) -I$(DRUNTIME_DIR)/import -I$(PHOBOS_DIR) -L-L$(PHOBOS_DIR)/generated/$(OS)/release/$(MODEL)
@@ -409,18 +410,21 @@ ${GENERATED}/${LATEST}.ddoc :
409410

410411
${GENERATED}/modlist-${LATEST}.ddoc : tools/modlist.d ${STABLE_DMD} $(DRUNTIME_LATEST_DIR) $(PHOBOS_LATEST_DIR) $(DMD_LATEST_DIR)
411412
mkdir -p $(dir $@)
412-
$(STABLE_RDMD) $< $(DRUNTIME_LATEST_DIR) $(PHOBOS_LATEST_DIR) $(DMD_LATEST_DIR) $(MOD_EXCLUDES_LATEST) \
413-
$(addprefix --dump , object std etc core dmd rt) >$@
413+
$(STABLE_RDMD) $< $(DRUNTIME_LATEST_DIR)/src $(PHOBOS_LATEST_DIR) $(DMD_LATEST_DIR)/src $(MOD_EXCLUDES_LATEST) \
414+
$(addprefix --internal=, dmd rt core.internal) \
415+
$(addprefix --dump , object std etc core dmd rt core.internal.array core.internal.util) >$@
414416

415417
${GENERATED}/modlist-release.ddoc : tools/modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR) $(DMD_DIR)
416418
mkdir -p $(dir $@)
417-
$(STABLE_RDMD) $< $(DRUNTIME_DIR) $(PHOBOS_DIR) $(DMD_DIR) $(MOD_EXCLUDES_RELEASE) \
418-
$(addprefix --dump , object std etc core dmd rt) >$@
419+
$(STABLE_RDMD) $< $(DRUNTIME_DIR)/src $(PHOBOS_DIR) $(DMD_DIR)/src $(MOD_EXCLUDES_RELEASE) \
420+
$(addprefix --internal=, dmd rt core.internal) \
421+
$(addprefix --dump , object std etc core dmd rt core.internal.array core.internal.util) >$@
419422

420423
${GENERATED}/modlist-prerelease.ddoc : tools/modlist.d ${STABLE_DMD} $(DRUNTIME_DIR) $(PHOBOS_DIR) $(DMD_DIR)
421424
mkdir -p $(dir $@)
422-
$(STABLE_RDMD) $< $(DRUNTIME_DIR) $(PHOBOS_DIR) $(DMD_DIR) $(MOD_EXCLUDES_PRERELEASE) \
423-
$(addprefix --dump , object std etc core dmd rt) >$@
425+
$(STABLE_RDMD) $< $(DRUNTIME_DIR)/src $(PHOBOS_DIR) $(DMD_DIR)/src $(MOD_EXCLUDES_PRERELEASE) \
426+
$(addprefix --internal=, dmd rt core.internal) \
427+
$(addprefix --dump , object std etc core dmd rt core.internal.array core.internal.util) >$@
424428

425429
# Run "make -j rebase" for rebasing all dox in parallel!
426430
rebase: rebase-dlang rebase-dmd rebase-druntime rebase-phobos

spec/arrays.dd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ int[3] a = [ 1:2, 3 ]; // a[0] = 0, a[1] = 2, a[2] = 3
812812

813813
$(SPEC_RUNNABLE_EXAMPLE_COMPILE
814814
---------
815-
enum Color { red, blue, green };
815+
enum Color { red, blue, green }
816816

817817
int[Color.max + 1] value =
818818
[ Color.blue :6,

0 commit comments

Comments
 (0)