Rollup of 13 pull requests #44460
Closed
Rollup of 13 pull requests #44460
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
frewsxcv
commented
Sep 9, 2017
frewsxcv
commented
- Successful merges: Explicitly run perl for OpenSSL Configure #44131, rustc: Separately feature gate repr(i128) #44262, Use rvalue promotion to 'static instead of static items. #44312, Fix extended bootstrap issues with OpenSSL on NetBSD build hosts #44320, Fixup some nits from #44238 #44329, Expect pipe symbol after closure parameter list #44332, Reduce false positives number in rustdoc html diff #44347, Use memalign instead of posix_memalign for Solaris #44372, std: Fix a segfault on OSX with backtraces #44384, Update the libcompiler_builins submodule #44387, std::thread::LocalKey: Document limitation with initializers #44396, Add doc example to String::as_str #44449, Fix bitrotted generator panic emission #44451
- Failed merges:
OpenSSL's Configure script is missing a shebang. On some platforms, execve falls back to execution with the shell. Some other platforms, like musl, will fail with an exec format error. Avoid this by calling perl explicitly (since it's a perl script).
Brought up during the discussion of rust-lang#35118, the support for this is still somewhat buggy and so stabilization likely wants to be considered independently of the type itself.
NetBSD doesn't ship with sha256sum. The openssl build will probably try to use perl anyway, so using perl's shasum is reasonable.
Some tar(1) programs—such as NetBSD's—do not automatically decompress.
As pointed out in rust-lang/libc@deb61c8, Solaris 10 does not support posix_memalign. Use memalign for all Solaris versions instead. With this change applied I am able to cross-build rustc for Solaris 10.
Apparently `dladdr` can succeed but still give you NULL pointers! Closes rust-lang#44379
Pulls in rust-lang/compiler-builtins#187 for nicer build output :)
Explicitly run perl for OpenSSL Configure OpenSSL's Configure script is missing a shebang. On some platforms, execve falls back to execution with the shell. Some other platforms, like musl, will fail with an exec format error. Avoid this by calling perl explicitly (since it's a perl script).
…atsakis rustc: Separately feature gate repr(i128) Brought up during the discussion of rust-lang#35118, the support for this is still somewhat buggy and so stabilization likely wants to be considered independently of the type itself.
…lexcrichton Use rvalue promotion to 'static instead of static items. Fixes rust-lang#44240. Among other things, in crates that do a lot of formatting, this could reduce the number of items, although I haven't measured the performance benefits. If there's a codegen slowdown, that should IMO be solved by caching the output of miri, *not* by using `static`. r? @alexcrichton
…d-8c68-1aecbd570fab, r=alexcrichton Fix extended bootstrap issues with OpenSSL on NetBSD build hosts
Fixup some nits from rust-lang#44238 r? @ollie27
Expect pipe symbol after closure parameter list Fixes rust-lang#44021. --- Originally, the parser just called `bump` to discard following token after parsing closure parameter list, because it assumes `|` is following. However, the following code breaks the assumption: ```rust struct MyStruct; impl MyStruct { fn f() {|x, y} } ``` Here, the parameter list is `x, y` and the following token is `}`. The parser discards `}`, and then we have a curly bracket mismatch. Indeed, this code has a syntax error. On current nightly, the compiler emits an syntax error, but with incorrect message and span, followed by an ICE. ``` error: expected expression, found `}` --> 44021.rs:4:1 | 4 | } | ^ error: internal compiler error: unexpected panic ``` Even worse, on current stable(1.20.0), the compiler falls into an infinite loop. This pull request fixes this problem. Now the compiler emits correct error message and span, and does not ICE. ``` error: expected one of `:`, `@`, or `|`, found `}` --> 44021.rs:3:20 | 3 | fn foo() {|x, y} | ^ expected one of `:`, `@`, or `|` here ```
…ve, r=QuietMisdreavus Reduce false positives number in rustdoc html diff cc @rust-lang/dev-tools r? @nrc Very simple trick but should lighten html diff a bit
Use memalign instead of posix_memalign for Solaris As pointed out in rust-lang/libc@deb61c8, Solaris 10 does not support posix_memalign. Use memalign for all Solaris versions instead. With this change applied I am able to cross-build rustc for Solaris 10.
std: Fix a segfault on OSX with backtraces Apparently `dladdr` can succeed but still give you NULL pointers! Closes rust-lang#44379
…ark-Simulacrum Update the libcompiler_builins submodule Pulls in rust-lang/compiler-builtins#187 for nicer build output :)
std::thread::LocalKey: Document limitation with initializers Document that if a `LocalKey`'s initializer recursively depends on itself, initialization will result in infinite recursion.
Add doc example to String::as_str Fixes rust-lang#44428.
Fix bitrotted generator panic emission r? @eddyb
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ p=10 |
|
📌 Commit e3d0be2 has been approved by |
|
⌛ Testing commit e3d0be2 with merge eb7beea216f3025ab95ba2cb0e4c6ae549fe89ab... |
|
💔 Test failed - status-travis |
|
Failure likely caused by #44312. |
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.