Skip to content

Commit f32b426

Browse files
committed
Merge remote-tracking branch 'upstream/master' into stable
2 parents ed36308 + 3e1d86e commit f32b426

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

changed.d

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,13 @@ auto getIssues(string revRange)
132132
import std.regex : ctRegex, match, splitter;
133133

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

141143
auto issues = appender!(int[]);
142144
foreach (repo; ["dmd", "phobos", "dlang.org", "tools", "installer"]

test/tests_extractor/iteration.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,7 +2308,7 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR)
23082308
import std.algorithm.comparison : equal;
23092309
import std.range;
23102310

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

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

2548-
// issue 8792
2548+
// https://issues.dlang.org/show_bug.cgi?id=8792
25492549
auto b = [[1], [2], [3]];
25502550
auto jb = joiner(b);
25512551
auto js = jb.save;

0 commit comments

Comments
 (0)