Skip to content

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

Merged
dlang-bot merged 6 commits intodlang:masterfrom
MartinNowak:merge_stable
Feb 16, 2017
Merged

Merge remote-tracking branch 'upstream/stable' into merge_stable#5122
dlang-bot merged 6 commits intodlang:masterfrom
MartinNowak:merge_stable

Conversation

@MartinNowak
Copy link
Member

Conflicts:
std/regex/internal/bitnfa.d
std/regex/internal/tests3.d

@dlang-bot
Copy link
Contributor

Fix Bugzilla Description
17161 [REG 2.072.2] Massive Regex Slowdown
17176 https://dlang.org/phobos/std_stdio.html#.File.tmpfile broken link

Copy link
Member

@DmitryOlshansky DmitryOlshansky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JackStouffer
Copy link
Contributor

BTW, dub and vibe.d have been failing to compile for a bit now after a druntime change. I would look into that before releasing 2.073.1

@DmitryOlshansky
Copy link
Member

Has some failures on Circle-CI looks like some missing imports std.regex.package.

# Conflicts:
#	std/regex/internal/bitnfa.d
#	std/regex/internal/tests3.d
- old tests after reverting BitNFA didn't have isolated runnable unittests
@MartinNowak
Copy link
Member Author

Has some failures on Circle-CI looks like some missing imports std.regex.package.

That was the extracted unittests missing some imports.

@dlang-bot dlang-bot merged commit da3e83a into dlang:master Feb 16, 2017
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.

5 participants