Skip to content

Commit dceabcc

Browse files
committed
Merge pull request #1215 from MartinNowak/merge_stable
Merge remote-tracking branch 'upstream/stable' into merge_stable
2 parents a087961 + 7c28e11 commit dceabcc

File tree

5 files changed

+40
-18
lines changed

5 files changed

+40
-18
lines changed

changelog/2.070.0_pre.dd renamed to changelog/2.070.0.dd

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@ Ddoc
22

33
$(CHANGELOG_NAV_LAST 2.069.2)
44

5-
$(VERSION Jan 14, 2016, =================================================,
5+
$(VERSION Jan 27, 2016, =================================================,
66

77
$(BUGSTITLE Language Changes,
88
$(LI $(RELATIVE_LINK2 alias-funclit, Add syntactic support to make an alias to a function literal.))
99
)
1010

1111
$(BUGSTITLE Library Changes,
12-
$(LI $(RELATIVE_LINK2 TypeInfo.initializer, `TypeInfo.init` has been renamed to `TypeInfo.initializer`.))
13-
$(LI $(RELATIVE_LINK2 json-encode-control-characters, `std.json` encodes string control characters.))
1412
$(LI The package $(STDMODREF experimental_ndslice, std.experimental.ndslice) was added.
1513
It is also available as part of the $(LINK2 https://github.com/DlangScience/mir, Mir library).)
14+
$(LI $(RELATIVE_LINK2 core-sys-windows, The `core.sys.windows` package has been
15+
greatly expanded.)
16+
)
17+
$(LI $(RELATIVE_LINK2 typeinfo-initializer, `TypeInfo.init` has been renamed to `TypeInfo.initializer`.))
18+
$(LI $(RELATIVE_LINK2 json-encode-control-characters, `std.json` encodes string control characters.))
1619
$(LI Default LogLevel of FileLogger was changed to LogLevel.all.)
20+
$(LI Access to the internal `ptr` and `len` fields of $(XREF bitmanip, BitArray) was deprecated.)
1721
)
1822

1923
$(BR)$(BIG $(RELATIVE_LINK2 bugfix-list, List of all bug fixes and enhancements in D $(VER).))
@@ -41,20 +45,26 @@ $(LI $(LNAME2 alias-funclit, Add syntactic support to make an alias to a functio
4145

4246
$(BUGSTITLE Library Changes,
4347

44-
$(LI $(LNAME2 TypeInfo.initializer, `TypeInfo.init` has been renamed to
48+
$(LI $(LNAME2 core-sys-windows, The `core.sys.windows` package has been
49+
greatly expanded.)
50+
51+
$(P The `core.sys.windows` package now contains a considerably more
52+
comprehensive set of Windows API bindings. The package has been
53+
adapted from $(WEB github.com/smjgordon/bindings, Stewart Gordon's
54+
bindings), which were originally adapted from the MinGW project.
55+
)
56+
)
57+
58+
$(LI $(LNAME2 typeinfo-initializer, `TypeInfo.init` has been renamed to
4559
`TypeInfo.initializer`.)
4660

4761
$(P The method `TypeInfo.init` has been renamed to
48-
$(A ../phobos-prerelease/object.html#.TypeInfo.initializer,
49-
`TypeInfo.initializer`).
50-
This is necessary because the method clashes with the
51-
$(A ../property.html#init, type property of the same name).
62+
$(NOXREF TypeInfo.initializer, TypeInfo.initializer) to resolve
63+
a name clash with the type property $(GLINK2 property, init).
5264
)
53-
$(P An alias with the old name has been added, and it's supposed to stay
54-
around through version 2.071.0. It's scheduled to be deprecated with the
55-
2.072.0 release, and is going to be `@disable`d with the 2.073.0
56-
release. Finally, the special casing is going to be removed with the
57-
2.074.0 release, so that the type property `init` takes over.
65+
66+
$(P An alias with the old name was added and will be deprecated
67+
over the next releases.
5868
)
5969
)
6070

@@ -80,6 +90,7 @@ $(LI $(BUGZILLA 14782): Internal error: backend/cod1.c)
8090
$(LI $(BUGZILLA 15369): [REG master] id.d$(LPAREN)369$(RPAREN): Error: Outside Unicode code space)
8191
$(LI $(BUGZILLA 15430): amdMmx hangs up)
8292
$(LI $(BUGZILLA 15500): default construction disabled for struct constructor with default arguments)
93+
$(LI $(BUGZILLA 15550): [Reg 2.070.0-b1] compile error while testing template constraint)
8394
)
8495
)
8596
$(BUGSTITLE DMD Compiler bugs,
@@ -142,7 +153,6 @@ $(LI $(BUGZILLA 15220): [REG2.065] std.getopt parses -o=value as "=value")
142153
$(LI $(BUGZILLA 15238): Heisenbug running std.random unittests)
143154
$(LI $(BUGZILLA 15313): std.conv.emplace cannot initialize const objects)
144155
$(LI $(BUGZILLA 15336): std.json: opIn undocumented for JSONValue)
145-
$(LI $(BUGZILLA 15364): BitArray.len should be private)
146156
$(LI $(BUGZILLA 15409): Mallocator cant be used in @nogc code)
147157
$(LI $(BUGZILLA 15420): topN$(LPAREN)Range, Range$(RPAREN) does not respect its less predicate)
148158
$(LI $(BUGZILLA 15429): [std.stdio] Broken link in documentation)
@@ -197,6 +207,13 @@ $(LI $(BUGZILLA 15174): Add or undocument --tmpdir switch)
197207
$(LI $(BUGZILLA 15175): rdmd --loop and --eval now complain about std.stream deprecation warnings)
198208
)
199209
)
210+
$(BUGSTITLE Installer bugs,
211+
212+
$(P
213+
$(LI $(BUGZILLA 15456): sc.ini: Access denied for non-superusers on Windows 10)
214+
$(LI $(BUGZILLA 15572): Windows installer leaves "sc.ini" inaccessible)
215+
)
216+
)
200217

201218
)
202219

changelog/changelog.ddoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ STDMODREF = $(LINK2 $(ROOT_DIR)phobos/std_$1.html, $(D $2))
5050
COREMODREF = $(LINK2 $(ROOT_DIR)phobos/core_$1.html, $(D $2))
5151
XREF = $(LINK2 $(ROOT_DIR)phobos/std_$1.html#$2, $(D $2))
5252
CXREF = $(LINK2 $(ROOT_DIR)phobos/core_$1.html#$2, $(D $2))
53+
OXREF = $(LINK2 $(ROOT_DIR)phobos/object.html#$2, $(D $2))
5354
_=nested XREFs
5455
NXREF = $(LINK2 $(ROOT_DIR)phobos/std_$1.html#.$2, $(D $2))
5556
NCXREF = $(LINK2 $(ROOT_DIR)phobos/core_$1.html#.$2, $(D $2))
57+
NOXREF = $(LINK2 $(ROOT_DIR)phobos/object.html#.$2, $(D $2))
5658

5759
PULL_REQUEST = $(LINK2 https://github.com/D-Programming-Language/$1/pull/$2, $1#$2)
5860
DMDPR = $(PULL_REQUEST dmd,$1)
@@ -62,6 +64,7 @@ _=
6264

6365
CHANGELOG_VERSION = $(LI <a id="$0" href="$0.html">$0</a>)
6466
CHANGELOG_VERSIONS =
67+
$(CHANGELOG_VERSION 2.070.0)
6568
$(CHANGELOG_VERSION 2.069.2)
6669
$(CHANGELOG_VERSION 2.069.1)
6770
$(CHANGELOG_VERSION 2.069.0)

changelog/prerelease.ddoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ STDMODREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/std_$1.html, $(D $2))
1111
COREMODREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/core_$1.html, $(D $2))
1212
XREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/std_$1.html#$2, $(D $2))
1313
CXREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/core_$1.html#$2, $(D $2))
14+
OXREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/object.html#$2, $(D $2))
1415
_=nested XREFs
1516
NXREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/std_$1.html#.$2, $(D $2))
1617
NCXREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/core_$1.html#.$2, $(D $2))
18+
NOXREF = $(LINK2 $(ROOT_DIR)phobos-prerelease/object.html#.$2, $(D $2))

download.dd

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

122122
DMDV2=$(LATEST)
123123

124-
_=BETA=$(COMMENT $0)
125-
BETA=$0
124+
BETA=$(COMMENT $0)
125+
_=BETA=$0
126126
B_DMDV2=2.070.0
127127
B_SUFFIX=b2
128128

win32.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ changelog\2.069.1.html : $(CHANGELOG_DDOC) changelog\2.069.1.dd
332332
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
333333
changelog\2.069.2.html : $(CHANGELOG_DDOC) changelog\2.069.2.dd
334334
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
335-
changelog\2.070.0.html : $(CHANGELOG_DDOC) changelog\2.070.0_pre.dd
336-
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_PRE_DDOC) $*.dd
335+
changelog\2.070.0.html : $(CHANGELOG_DDOC) changelog\2.070.0.dd
336+
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
337337
changelog\index.html : $(CHANGELOG_DDOC) changelog\index.dd
338338
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
339339

0 commit comments

Comments
 (0)