Skip to content

Rollup of 17 pull requests #48531

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 63 commits into from
Feb 25, 2018
Merged

Rollup of 17 pull requests #48531

merged 63 commits into from
Feb 25, 2018

Conversation

Vitali Lovich and others added 30 commits February 2, 2018 11:29
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
…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.
@kennytm kennytm changed the title Rollup of 16 pull requests Rollup of 15 pull requests Feb 25, 2018
@kennytm
Copy link
Member Author

kennytm commented Feb 25, 2018

@bors r+

Removed #48330

@bors
Copy link
Collaborator

bors commented Feb 25, 2018

📌 Commit 268b6d6 has been approved by kennytm

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 25, 2018
… 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.
@kennytm kennytm changed the title Rollup of 15 pull requests Rollup of 16 pull requests Feb 25, 2018
@kennytm
Copy link
Member Author

kennytm commented Feb 25, 2018

@bors r+

Added #48235

@bors
Copy link
Collaborator

bors commented Feb 25, 2018

📌 Commit 0652af2 has been approved by kennytm

frewsxcv and others added 2 commits February 25, 2018 08:54
…on, r=sfackler

Add tests ensuring zero-Duration timeouts result in errors; fix Redox issues.

Part of rust-lang#48311
@kennytm kennytm changed the title Rollup of 16 pull requests Rollup of 17 pull requests Feb 25, 2018
@kennytm
Copy link
Member Author

kennytm commented Feb 25, 2018

@bors r+

Added back #48330 now that the error should be fixed.

@bors
Copy link
Collaborator

bors commented Feb 25, 2018

📌 Commit 1aa1035 has been approved by kennytm

@bors
Copy link
Collaborator

bors commented Feb 25, 2018

⌛ Testing commit 1aa1035 with merge 322d7f7...

bors added a commit that referenced this pull request Feb 25, 2018
Rollup of 17 pull requests

- Successful merges: #47964, #47970, #48076, #48115, #48166, #48281, #48297, #48302, #48362, #48369, #48489, #48491, #48494, #48517, #48529, #48235, #48330
- Failed merges:
@bors
Copy link
Collaborator

bors commented Feb 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 322d7f7 to master...

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.