[0.2] Backports #4017
Merged
[0.2] Backports #4017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @JohnTitor rustbot has assigned @JohnTitor. Use |
tgross35
force-pushed
the
backport-watercress
branch
from
539bbaf
to
cc2f5aa
Compare
|
☔ The latest upstream changes (presumably #4016) made this pull request unmergeable. Please resolve the merge conflicts. |
tgross35
force-pushed
the
backport-watercress
branch
from
cc2f5aa
to
acb03cc
Compare
|
Including #4019 so this can merge without conflict |
tgross35
force-pushed
the
backport-watercress
branch
from
acb03cc
to
2eb8321
Compare
(backport <rust-lang#3864>) (cherry picked from commit ec3c338)
Constants added from [this commit]. [this commit]: illumos/illumos-gate@0250c53 Additionally, resolves some issues introduced in ec3c338 ("Fix tests on Solaris"). [ add note about fixing ec3c338 - Trevor ] (backport <rust-lang#3999>) (cherry picked from commit e2a23f0)
Illumos reference (originally included in Solaris): https://github.com/illumos/illumos-gate/blob/aaceae985c2e78cadef76bf0b7b50ed887ccb3a6/usr/src/head/fnmatch.h#L41 (backport <rust-lang#4004>) (cherry picked from commit 98a20b3)
tgross35
force-pushed
the
backport-watercress
branch
from
2eb8321
to
61150a4
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport the following Solaris changes:
Also cherry picks the backport of #3634 so this can start before #4016 merges.