Skip to content

Commit 57fe9de

Browse files
committed
Merge remote-tracking branch 'upstream/stable' into merge_stable
# Conflicts: # changelog/2.078.0.dd
2 parents 5d84a31 + 6fd4207 commit 57fe9de

File tree

6 files changed

+23
-6
lines changed

6 files changed

+23
-6
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.078.0
1+
2.078.1

changelog/2.078.0.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Ddoc
22

3-
$(CHANGELOG_NAV_LAST 2.077.1)
3+
$(CHANGELOG_NAV 2.077.1,2.078.1)
44

55
$(VERSION Jan 01, 2018, =================================================,
66

@@ -748,7 +748,7 @@ $(D_CONTRIBUTORS
748748
$(D_CONTRIBUTOR Yuxuan Shui)
749749
)
750750
$(D_CONTRIBUTORS_FOOTER)
751-
$(CHANGELOG_NAV_LAST 2.077.1)
751+
$(CHANGELOG_NAV 2.077.1,2.078.1)
752752
Macros:
753753
VER=2.078.0
754754
TITLE=Change Log: $(VER)

changelog/2.078.1_pre.dd renamed to changelog/2.078.1.dd

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Ddoc
22

33
$(CHANGELOG_NAV_LAST 2.078.0)
44

5-
$(VERSION Jan 16, 2018, =================================================,
5+
$(VERSION Jan 21, 2018, =================================================,
66

77
$(CHANGELOG_SEP_HEADER_TEXT_NONEMPTY)
88

@@ -16,12 +16,14 @@ $(LI $(BUGZILLA 16621): [REG2.060] DMD hang in semantic3 on alias this)
1616
)
1717
$(BUGSTITLE_BUGZILLA DMD Compiler bugs,
1818

19+
$(LI $(BUGZILLA 13742): undefined reference to __coverage)
1920
$(LI $(BUGZILLA 18111): unittests get different names depending on how the files are passed to dmd)
2021
$(LI $(BUGZILLA 18233): building with -m64 doesn't work with sc.ini from the zip distribution and VS2017)
2122
)
2223
$(BUGSTITLE_BUGZILLA Phobos bugs,
2324

2425
$(LI $(BUGZILLA 18215): std.array.replace throws a range violation if the from range is longer than the array)
26+
$(LI $(BUGZILLA 18244): Generic functions in std.math cannot be overloaded)
2527
)
2628
$(BUGSTITLE_BUGZILLA Druntime regressions,
2729

@@ -32,6 +34,18 @@ $(BUGSTITLE_BUGZILLA dlang.org bugs,
3234
$(LI $(BUGZILLA 16017): package functions show up in std.experimental.allocator.common docs)
3335
)
3436
)
37+
$(D_CONTRIBUTORS_HEADER 8)
38+
$(D_CONTRIBUTORS
39+
$(D_CONTRIBUTOR Atila Neves)
40+
$(D_CONTRIBUTOR Eugen Wissner)
41+
$(D_CONTRIBUTOR growlercab)
42+
$(D_CONTRIBUTOR H. S. Teoh)
43+
$(D_CONTRIBUTOR Martin Nowak)
44+
$(D_CONTRIBUTOR Rainer Schuetze)
45+
$(D_CONTRIBUTOR Sebastian Wilzbach)
46+
$(D_CONTRIBUTOR Walter Bright)
47+
)
48+
$(D_CONTRIBUTORS_FOOTER)
3549
$(CHANGELOG_NAV_LAST 2.078.0)
3650
Macros:
3751
VER=2.078.1

changelog/changelog.ddoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ CHANGELOG_VERSION = $(LI <a id="$1" href="$1.html">$1</a><span class="hide-from-
7575
CHANGELOG_VERSION_PRE = $(LI <a id="$1" href="$1_pre.html">$1</a><span class="hide-from-nav"> ($+)</span>)
7676
_=BEGIN_GENERATED_CHANGELOG_VERSIONS
7777
CHANGELOG_VERSIONS =
78+
$(CHANGELOG_VERSION 2.078.1, Jan 21, 2018)
7879
$(CHANGELOG_VERSION 2.078.0, Jan 01, 2018)
7980
$(CHANGELOG_VERSION 2.077.1, Nov 29, 2017)
8081
$(CHANGELOG_VERSION 2.077.0, Nov 1, 2017)

download.dd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ Macros:
204204

205205
DMDV2=$(LATEST)
206206

207-
_=BETA=$(COMMENT $0)
208-
BETA=$0
207+
BETA=$(COMMENT $0)
208+
_=BETA=$0
209209
B_DMDV2=2.078.1
210210
B_SUFFIX=beta.1
211211

dpl-docs/source/app.d

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ int main(string[] args)
1616
environment["GIT_TARGET"] = git_target;
1717
environment["NO_EXACT_SOURCE_CODE_LINKS"] = noExactSourceCodeLinks ? "1" : "0";
1818
setLogFormat(FileLogger.Format.plain);
19+
if (args.length > 1 && args[1] != "filter")
20+
args ~= "--html-style=pretty";
1921
return ddoxMain(args);
2022
}

0 commit comments

Comments
 (0)