diff options
author | Iain Buclaw <ibuclaw@gdcproject.org> | 2023-10-15 19:09:05 +0200 |
---|---|---|
committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2023-10-16 19:14:10 +0200 |
commit | 964fd402c9b48eb4da91fb3e4e45d4560d6c676c (patch) | |
tree | a34980fffb3f1e8e7347b727a6d7243cc0ad7320 /libphobos/src/std/algorithm | |
parent | c7609acb8a8210188d21b2cd72ecc6d3b2de2ab8 (diff) | |
download | gcc-964fd402c9b48eb4da91fb3e4e45d4560d6c676c.zip gcc-964fd402c9b48eb4da91fb3e4e45d4560d6c676c.tar.gz gcc-964fd402c9b48eb4da91fb3e4e45d4560d6c676c.tar.bz2 |
d: Merge upstream dmd, druntime 4c18eed967, phobos d945686a4.
D front-end changes:
- Import latest fixes to mainline.
D runtime changes:
- Import latest fixes to mainline.
Phobos changes:
- Import latest fixes to mainline.
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd 4c18eed967.
* d-diagnostic.cc (verrorReport): Update for new front-end interface.
(verrorReportSupplemental): Likewise.
* d-lang.cc (d_init_options): Likewise.
(d_handle_option): Likewise.
(d_post_options): Likewise.
(d_parse_file): Likewise.
* decl.cc (get_symbol_decl): Likewise.
libphobos/ChangeLog:
* libdruntime/MERGE: Merge upstream druntime 4c18eed967.
* src/MERGE: Merge upstream phobos d945686a4.
Diffstat (limited to 'libphobos/src/std/algorithm')
-rw-r--r-- | libphobos/src/std/algorithm/iteration.d | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libphobos/src/std/algorithm/iteration.d b/libphobos/src/std/algorithm/iteration.d index 39927be..0adb88b 100644 --- a/libphobos/src/std/algorithm/iteration.d +++ b/libphobos/src/std/algorithm/iteration.d @@ -2975,9 +2975,9 @@ auto joiner(RoR, Separator)(RoR r, Separator sep) static assert(isInputRange!(ElementType!RoR), "The ElementyType of RoR '" , ElementType!(RoR).stringof, "' must be an InputRange " , "(isInputRange!(ElementType!(", RoR.stringof , ")))."); - static assert(isForwardRange!Separator, "The type of the Seperator '" - , Seperator.stringof, "' must be a ForwardRange (isForwardRange!(" - , Seperator.stringof, "))."); + static assert(isForwardRange!Separator, "The type of the Separator '" + , Separator.stringof, "' must be a ForwardRange (isForwardRange!(" + , Separator.stringof, "))."); static assert(is(ElementType!Separator : ElementType!(ElementType!RoR)) , "The type of the elements of the separator range does not match " , "the type of the elements that are joined. Separator type '" |