Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
ibuclaw committed Jul 15, 2023
2 parents ed36308 + 3e1d86e commit f32b426
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions changed.d
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,13 @@ auto getIssues(string revRange)
import std.regex : ctRegex, match, splitter;

// Keep in sync with the regex in dlang-bot:
// https://github.com/dlang/dlang-bot/blob/master/source/dlangbot/bugzilla.d#L29
// https://github.com/dlang/dlang-bot/blob/master/source/dlangbot/bugzilla.d#L24
// This regex was introduced in https://github.com/dlang/dlang-bot/pull/240
// and only the first part of the regex is needed (the second part matches
// issues reference that won't close the issue).
enum closedRE = ctRegex!(`(?:^fix(?:es)?(?:\s+(?:issues?|bugs?))?\s+(#?\d+(?:[\s,\+&and]+#?\d+)*))`, "i");
// Note: "Bugzilla" is required since https://github.com/dlang/dlang-bot/pull/302;
// temporarily both are accepted during a transition period.
enum closedRE = ctRegex!(`(?:^fix(?:es)?(?:\s+bugzilla)?(?:\s+(?:issues?|bugs?))?\s+(#?\d+(?:[\s,\+&and]+#?\d+)*))`, "i");

auto issues = appender!(int[]);
foreach (repo; ["dmd", "phobos", "dlang.org", "tools", "installer"]
Expand Down
6 changes: 3 additions & 3 deletions test/tests_extractor/iteration.d
Original file line number Diff line number Diff line change
Expand Up @@ -2308,7 +2308,7 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR)
import std.algorithm.comparison : equal;
import std.range;

// Related to issue 8061
// Related to https://issues.dlang.org/show_bug.cgi?id=8061
auto r = joiner([
inputRangeObject("abc"),
inputRangeObject("def"),
Expand Down Expand Up @@ -2542,10 +2542,10 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR))
import std.algorithm.comparison : equal;
import std.range.interfaces : inputRangeObject;

// bugzilla 8240
// https://issues.dlang.org/show_bug.cgi?id=8240
assert(equal(joiner([inputRangeObject("")]), ""));

// issue 8792
// https://issues.dlang.org/show_bug.cgi?id=8792
auto b = [[1], [2], [3]];
auto jb = joiner(b);
auto js = jb.save;
Expand Down

0 comments on commit f32b426

Please sign in to comment.