Skip to content

Merge remote-tracking branch 'upstream/stable' into merge_stable#5678

Merged
MartinNowak merged 13 commits intodlang:masterfrom
MartinNowak:merge_stable
Aug 16, 2017
Merged

Merge remote-tracking branch 'upstream/stable' into merge_stable#5678
MartinNowak merged 13 commits intodlang:masterfrom
MartinNowak:merge_stable

Conversation

@MartinNowak
Copy link
Member

No description provided.

wilzbach and others added 10 commits July 21, 2017 03:21
…onal

std.functional: Fix more DDoc links
Fix issue 17667 - regex([r".", r"[\(\{[\]\}\)]"]);
merged-on-behalf-of: Dmitry Olshansky <DmitryOlshansky@users.noreply.github.com>
Fix issue 17668 - assert failure regex(q"<[^]>")
merged-on-behalf-of: Dmitry Olshansky <DmitryOlshansky@users.noreply.github.com>
fix issue 17192 - ParameterDefaults fails when parameter is called "i"
merged-on-behalf-of: Martin Nowak <code@dawg.eu>
@dlang-bot
Copy link
Contributor

Thanks for your pull request, @MartinNowak!

Bugzilla references

Auto-close Bugzilla Description
17192 ParameterDefaults fails when parameter is called "i"
17667 regex([r".", r"[({[]})]"]);
17668 regex(q"<[^]>")

@JackStouffer
Copy link
Contributor

#5671 added a unit test without an annotation and was somehow merged without a CI warning

@andralex
Copy link
Member

andralex commented Aug 8, 2017

@MartinNowak feel free to merge after taking a look at the matter raised by @JackStouffer

@MartinNowak
Copy link
Member Author

#5671 added a unit test without an annotation

We don't use the term annoation anywhere in D, don't want to be picky, but sloppy language tends to cause lots of confusion in the long-run.
Also those are the sort of tiny things I'd prefer people would just fix right away, rather than ping-ponging 2-3 other people.
I'll include this with #5692.

@MartinNowak MartinNowak force-pushed the merge_stable branch 2 times, most recently from 8c7d365 to deb28da Compare August 16, 2017 10:19
@MartinNowak MartinNowak merged commit 406f4ec into dlang:master Aug 16, 2017
@MartinNowak MartinNowak deleted the merge_stable branch August 16, 2017 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants