Skip to content

Commit 4650c77

Browse files
authored
Merge pull request #11059 from rainers/merge_stable
Merge stable to master
2 parents 7956892 + 31443ab commit 4650c77

3 files changed

Lines changed: 18 additions & 11 deletions

File tree

std/experimental/allocator/building_blocks/allocator_list.d

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1326,10 +1326,11 @@ template SharedAllocatorList(alias factoryFunction,
13261326
assert(a.deallocateAll());
13271327
}
13281328

1329-
//BUG: this test freezes spuriously on FreeBSD, see also https://github.com/dlang/phobos/issues/10730.
1329+
//BUG: this test freezes spuriously on FreeBSD, Alpine, macOS and probably more.
1330+
// See also https://github.com/dlang/phobos/issues/10730.
13301331
// The lock in a.allocate() below blocks in all remaining threads causing the join to never complete.
13311332
// This might also hint at problems in the spinlock implementation.
1332-
version (FreeBSD) {} else
1333+
version (none)
13331334
@system unittest
13341335
{
13351336
import std.experimental.allocator.mallocator : Mallocator;

std/mathspecial.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ do
429429
///
430430
@safe unittest
431431
{
432-
assert(gammaIncomplete(1, 1) == 1 - 1/E);
432+
assert(isClose(gammaIncomplete(1, 1), 1 - 1/E));
433433
assert(gammaIncomplete(1, 0) == 0);
434434
assert(gammaIncomplete(1, real.infinity) == 1);
435435
assert(gammaIncomplete(+0., 1) == 1);
@@ -537,7 +537,7 @@ do
537537
const a = 2, p = 0.5L;
538538
assert(isClose(gammaIncompleteComplInverse(a, gammaIncompleteCompl(a, p)), p));
539539

540-
assert(gammaIncompleteComplInverse(1, 1/E) == 1);
540+
assert(isClose(gammaIncompleteComplInverse(1, 1/E), 1));
541541
assert(isNaN(gammaIncompleteComplInverse(+0.0L, 0.1)));
542542
assert(isNaN(gammaIncompleteComplInverse(real.infinity, 0.2)));
543543
assert(gammaIncompleteComplInverse(3, 0) is real.infinity);

std/net/curl.d

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2175,7 +2175,7 @@ private mixin template Protocol()
21752175
* auto client = HTTP("dlang.org");
21762176
* client.onReceive = (ubyte[] data)
21772177
* {
2178-
* writeln("Got data", to!(const(char)[])(data));
2178+
* writeln("Got data", bitCast!(const(char)[])(data));
21792179
* return data.length;
21802180
* };
21812181
* client.perform();
@@ -2834,7 +2834,7 @@ struct HTTP
28342834
* auto client = HTTP("dlang.org");
28352835
* client.onReceive = (ubyte[] data)
28362836
* {
2837-
* writeln("Got data", to!(const(char)[])(data));
2837+
* writeln("Got data", bitCast!(const(char)[])(data));
28382838
* return data.length;
28392839
* };
28402840
* client.perform();
@@ -2991,7 +2991,11 @@ struct HTTP
29912991
return p.headersIn;
29922992
}
29932993

2994-
/// HTTP method used.
2994+
/**
2995+
* HTTP method used.
2996+
*
2997+
* See_Also: $(LREF Method)
2998+
*/
29952999
@property void method(Method m)
29963000
{
29973001
p.method = m;
@@ -3069,7 +3073,7 @@ struct HTTP
30693073
* ----
30703074
* import std.net.curl, std.stdio, std.conv;
30713075
* auto http = HTTP("http://www.mydomain.com");
3072-
* http.onReceive = (ubyte[] data) { writeln(to!(const(char)[])(data)); return data.length; };
3076+
* http.onReceive = (ubyte[] data) { writeln(bitCast!(const(char)[])(data)); return data.length; };
30733077
* http.postData = [1,2,3,4,5];
30743078
* http.perform();
30753079
* ----
@@ -3088,7 +3092,7 @@ struct HTTP
30883092
* ----
30893093
* import std.net.curl, std.stdio, std.conv;
30903094
* auto http = HTTP("http://www.mydomain.com");
3091-
* http.onReceive = (ubyte[] data) { writeln(to!(const(char)[])(data)); return data.length; };
3095+
* http.onReceive = (ubyte[] data) { writeln(bitCast!(const(char)[])(data)); return data.length; };
30923096
* http.postData = "The quick....";
30933097
* http.perform();
30943098
* ----
@@ -3107,6 +3111,8 @@ struct HTTP
31073111
* "application/octet-stream". See also:
31083112
* $(LINK2 http://en.wikipedia.org/wiki/Internet_media_type,
31093113
* Internet media type) on Wikipedia.
3114+
*
3115+
* Example:
31103116
* -----
31113117
* import std.net.curl;
31123118
* auto http = HTTP("http://onlineform.example.com");
@@ -3160,7 +3166,7 @@ struct HTTP
31603166
* ----
31613167
* import std.net.curl, std.stdio, std.conv;
31623168
* auto http = HTTP("dlang.org");
3163-
* http.onReceive = (ubyte[] data) { writeln(to!(const(char)[])(data)); return data.length; };
3169+
* http.onReceive = (ubyte[] data) { writeln(bitCast!(const(char)[])(data)); return data.length; };
31643170
* http.onReceiveHeader = (in char[] key, in char[] value) { writeln(key, " = ", value); };
31653171
* http.perform();
31663172
* ----
@@ -4568,7 +4574,7 @@ struct Curl
45684574
* Curl curl;
45694575
* curl.initialize();
45704576
* curl.set(CurlOption.url, "http://dlang.org");
4571-
* curl.onReceive = (ubyte[] data) { writeln("Got data", to!(const(char)[])(data)); return data.length;};
4577+
* curl.onReceive = (ubyte[] data) { writeln("Got data", bitCast!(const(char)[])(data)); return data.length;};
45724578
* curl.perform();
45734579
* ----
45744580
*/

0 commit comments

Comments
 (0)