Rollup of 5 pull requests #44707
Merged
Rollup of 5 pull requests #44707
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
Member
GuillaumeGomez
commented
Sep 19, 2017
GuillaumeGomez
commented
- Successful merges: [Redox] Sync with upstream syscall library #44513, Skip passing /natvis to lld-link until supported. #44626, [libstd_unicode] Expose UnicodeVersion type #44689, Fix a typo in rustc help menu #44693, Add some missing links in io docs #44703
- Failed merges:
LLVM 5.0.0's lld-link frontend errors out if passed /natvis. LLVM 6 (maybe earlier?) should at least ignore the flag. Hopefully LLVM will eventually support the flag, at which point this workaround can perhaps be simply removed, if 6? is old enough.
In <rust-lang#42998>, we added an uninstantiable type for the internal `UNICODE_VERSION` value, `UnicodeVersion`, but it was not made public to the outside of the crate, resulting in the value becoming less useful. Here we make the type accessible from the outside. Also add a run-pass test to make sure the type and value can be accessed as intended.
Change from native-static-deps to native-static-libs.
[Redox] Sync with upstream syscall library This syncs the vendored syscalls with their upstream versions.
…ssion-fix, r=michaelwoerister Skip passing /natvis to lld-link until supported. ### Overview Teaching rustc about MSVC's undocumented linker flag, /NATVIS, broke rustc's compatability with LLVM's `lld-link` frontend, as it does not recognize the flag. This pull request works around the problem by excluding `lld-link` by name. @retep998 discovered this regression. ### Possible Issues - Other linkers that try to be compatible with the MSVC linker flavor may also be broken and in need of workarounds. - Warning about the workaround may be overkill for a minor reduction in debug functionality. - Depending on how long this workaround sticks around, it may eventually be preferred to version check `lld-link` instead of assuming all versions are incompatible. ### Relevant issues * Broke in rust-lang#43221 Embed MSVC .natvis files into .pdbs and mangle debuginfo for &str, *T, and [T]. * LLVM patched in llvm-mirror/lld@27b9c42 to ignore the flag instead of erroring. r? @michaelwoerister
[libstd_unicode] Expose UnicodeVersion type In <rust-lang#42998>, we added an uninstantiable type for the internal `UNICODE_VERSION` value, `UnicodeVersion`, but it was not made public to the outside of the crate, resulting in the value becoming less useful. Here we make the type accessible from the outside. Also add a run-pass test to make sure the type and value can be accessed as intended.
…lexcrichton Fix a typo in rustc help menu Change from native-static-deps to native-static-libs. Fix a typo introduced by this merged pull request: rust-lang#43067
…QuietMisdreavus Add some missing links in io docs r? @rust-lang/docs
|
@bors: p=1 |
|
r? @dtolnay (rust_highfive has picked a reviewer for you, use r? to override) |
arielb1
added
the
S-waiting-on-bors
|
@bors r+ |
|
📌 Commit bfed2dc has been approved by |
|
⌛ Testing commit bfed2dc with merge 1c9cecaf6fa346c8c7e2012d87e22ed7a6282c4d... |
|
💔 Test failed - status-travis |
|
@bors retry
|
|
☀️ Test successful - status-appveyor, status-travis |
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.