Rollup of 17 pull requests #48531
Merged
Rollup of 17 pull requests #48531
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
kennytm
commented
Feb 25, 2018
•
kennytm
commented
- Successful merges: rustc_trans: rewrite mips64 ABI code #47964, Add Condvar APIs not susceptible to spurious wake #47970, pass correct pie args to gcc linker #48076, Add Iterator::flatten #48115, Stabilize 'entry_and_modify' feature #48166, Add powerpc-unknown-netbsd target #48281, Add missing pieces for sparc-linux-gnu support #48297, Move macro-at-most-once-rep-ambig test to ui test #48302, rustbuild: Restore Config.libdir_relative #48362, Rename rdrnd target feature to rdrand #48369, bootstrap: Add openssl configuration for x86_64-unknown-linux-gnux32 #48489, test: Fix s390x-unknown-linux-gnu atomic-lock-free test not run for systemz #48491, Workaround abort(2) on compilation error on FreeBSD. #48494, Added error-format flag to x.py. #48517, Fixes docs for ASCII functions to no longer claim U+0021 is '@'. #48529, Make ".e0" not parse as 0.0 #48235, Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues. #48330
- Failed merges:
Provide wait_until and wait_timeout_until helper wrappers that aren't susceptible to spurious wake.
Make condition closure accept mut T&. Clarify spurious wakeup documentation. Cleanup doc example code.
Switch feature guards to unstable Add missing semicolon Remove mut that's no longer necessary
When linking with gcc, run gcc -v to see if --enable-default-pie is compiled in. If it is, pass -no-pie when necessary to disable pie. Otherwise, pass -pie when necessary to enable it. Fixes rust-lang#48032 and fixes rust-lang#35061
Recent versions of gcc default to creating a position independent executable and must be explicitly told not to with the -no-pie argument. Old versions of gcc don't understand -no-pie and will throw an error. Check for that case and retry without -no-pie. This is safe because these old versions of gcc should never default to creating a position independent executable.
Also fix some code snippets in documentation.
This forces floats to have either a digit before the separating point, or after. Thus ".e0" is invalid like ".", when using `parse()`.
This re-introduces a `Config.libdir_relative` field, now derived from `libdir` and made relative to `prefix` if necessary. This fixes a regression from rust-lang#46592 when `--libdir` is given an absolute path. `Builder::sysroot_libdir` should always use a relative path so its callers don't clobber system locations, and `librustc` also asserts that `CFG_LIBDIR_RELATIVE` is really relative.
bootstrap: Add openssl configuration for x86_64-unknown-linux-gnux32 OpenSSL provides a native configuration for x86_64-unknown-linux-gnux32: > https://github.com/openssl/openssl/blob/master/Configurations/10-main.conf#L810 Let's use it.
test: Fix s390x-unknown-linux-gnu atomic-lock-free test not run for systemz The s390-unknown-linux-gnu atomic-lock-free test is currently run for ```LLVM_COMPONENTS == powerpc```. I assume it was meant to be run for ```LLVM_COMPONENTS == systemz```, so let's fix this.
…, r=eddyb Workaround abort(2) on compilation error on FreeBSD. Same problem as OpenBSD, tracking bug rust-lang#43575. @semarie @dumbbell
Added error-format flag to x.py. Fixes rust-lang#48475 r? @Mark-Simulacrum
…nnytm Fixes docs for ASCII functions to no longer claim U+0021 is '@'. Looks like a typo that got copy-pasted without anyone checking on it.
|
📌 Commit 268b6d6 has been approved by |
bors
added
S-waiting-on-bors
… r=alexcrichton Make ".e0" not parse as 0.0 This forces floats to have either a digit before the separating point, or after. Thus `".e0"` is invalid like `"."`, when using `parse()`. Fixes rust-lang#40654. As mentioned in the issue, this is technically a breaking change... but clearly incorrect behaviour at present.
|
📌 Commit 0652af2 has been approved by |
…on, r=sfackler Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues. Part of rust-lang#48311
|
📌 Commit 1aa1035 has been approved by |
bors
added a commit
that referenced
this pull request
Feb 25, 2018
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Feb 25, 2018
Merged
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.