diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2025-01-14 20:51:45 +0100 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2025-01-14 21:01:33 +0100 |
| commit | c8894b681143041205d41e02ede112cef082bf2f (patch) | |
| tree | 6f9723f0ec5c688110b7ea8175109a82de70b406 /libphobos/src | |
| parent | 5006b9d810b102d7360b503288a983fc6488c289 (diff) | |
d: Merge upstream dmd, druntime d6f693b46a, phobos 336bed6d8.
D front-end changes:
- Import latest fixes from dmd v2.110.0-rc.1.
D runtime changes:
- Import latest fixes from druntime v2.110.0-rc.1.
Phobos changes:
- Import latest fixes from phobos v2.110.0-rc.1.
Included in the merge are fixes for the following PRs:
PR d/118438
PR d/118448
PR d/118449
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd d6f693b46a.
* d-incpath.cc (add_import_paths): Update for new front-end interface.
libphobos/ChangeLog:
* libdruntime/MERGE: Merge upstream druntime d6f693b46a.
* src/MERGE: Merge upstream phobos 336bed6d8.
* testsuite/libphobos.init_fini/custom_gc.d: Adjust test.
Diffstat (limited to 'libphobos/src')
| -rw-r--r-- | libphobos/src/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/src/std/functional.d | 6 | ||||
| -rw-r--r-- | libphobos/src/std/socket.d | 2 | ||||
| -rw-r--r-- | libphobos/src/std/typecons.d | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE index aa35eae57e2..fdcc058c903 100644 --- a/libphobos/src/MERGE +++ b/libphobos/src/MERGE @@ -1,4 +1,4 @@ -03aeafd2095b563bb66b75342652d2dcea66c9e8 +336bed6d8ffec74d117b755866c5bd22e3d610a1 The first line of this file holds the git revision number of the last merge done from the dlang/phobos repository. diff --git a/libphobos/src/std/functional.d b/libphobos/src/std/functional.d index cf7e3ff8cc2..b1b1382280d 100644 --- a/libphobos/src/std/functional.d +++ b/libphobos/src/std/functional.d @@ -1349,7 +1349,8 @@ template memoize(alias fun) alias memoize = impl; } - auto impl(Args...)(Args args) if (is(typeof(fun(args)))) + auto impl(Args...)(Args args) + if (is(typeof(fun(args)))) { import std.typecons : Tuple, tuple; import std.traits : Unqual; @@ -1393,7 +1394,8 @@ template memoize(alias fun, uint maxSize) alias memoize = impl; } - auto impl(Args...)(Args args) if (is(typeof(fun(args)))) + auto impl(Args...)(Args args) + if (is(typeof(fun(args)))) { static if (args.length > 0) { diff --git a/libphobos/src/std/socket.d b/libphobos/src/std/socket.d index 7fa9974189f..99ac97ac1e3 100644 --- a/libphobos/src/std/socket.d +++ b/libphobos/src/std/socket.d @@ -15,7 +15,7 @@ /** * Socket primitives. - * Example: See $(SAMPLESRC listener.d) and $(SAMPLESRC htmlget.d) + * Example: See [listener.d](https://github.com/dlang/undeaD/blob/master/dmdsamples/listener.d) and [htmlget.d](https://github.com/dlang/undeaD/blob/master/dmdsamples/htmlget.d) * License: $(HTTP www.boost.org/LICENSE_1_0.txt, Boost License 1.0). * Authors: Christopher E. Miller, $(HTTP klickverbot.at, David Nadlinger), * $(HTTP thecybershadow.net, Vladimir Panteleev) diff --git a/libphobos/src/std/typecons.d b/libphobos/src/std/typecons.d index bd462f53a5b..a841e4720b2 100644 --- a/libphobos/src/std/typecons.d +++ b/libphobos/src/std/typecons.d @@ -3348,7 +3348,7 @@ package(std) Rebindable2!T rebindable2(T)(T value) this(ref inout S rhs) @safe inout { - this.i = i; + this.i = rhs.i; copied = true; } } |