Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Rollup of 9 pull requests #50290

Merged
merged 30 commits into from
Apr 27, 2018
Merged

Rollup of 9 pull requests #50290

merged 30 commits into from
Apr 27, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Apr 27, 2018

Successful merges:

Failed merges:

Daiki Mizukami and others added 29 commits April 11, 2018 07:21
... and reimplement proc_macro::Span::parent using it. This function turns out
to be useful in the compiler as well
This is useful when trying to compute when something is lexically before
something else, but they aren't necessarily in the same SyntaxContext
Upstream bug reports (rustwasm/wasm-bindgen#119) show that this may be the
culprit of odd crashes/hangs. The linker is a tiny fraction of build time anyway
right now so let's disable it and figure out how to possibly reenable it later
if necessary.
This commit emits the `uwtable` attribute to LLVM for platforms that require it
for the allocator shims that we generate to ensure that they can hopefully get
unwound past. This is a stab in the dark at helping
https://bugzilla.mozilla.org/show_bug.cgi?id=1456150 along.
This commit updates `parking_lot` to pull in Amanieu/parking_lot#70 and...

Closes rust-lang#49438
…abnik

std: Mark `ptr::Unique` with `#[doc(hidden)]`

`Unique` is now perma-unstable, so let's hide its docs.
…komatsakis

Stabilize dyn trait

This PR stabilizes RFC 2113. I followed the [stabilization guide](https://forge.rust-lang.org/stabilization-guide.html).

Related issue: rust-lang#49218
…=jseyfried

Add some utilities to `libsyntax`

Adds a few functions to `Mark` and `Span` that I found useful in an upcoming refactor of NLL region error reporting. Also includes some new documentation based on my discussion with @jseyfried on IRC.

r? @jseyfried
rustc: Disable threads in LLD for wasm

Upstream bug reports (rustwasm/wasm-bindgen#119) show that this may be the
culprit of odd crashes/hangs. The linker is a tiny fraction of build time anyway
right now so let's disable it and figure out how to possibly reenable it later
if necessary.
…eddyb

rustc: Emit `uwtable` for allocator shims

This commit emits the `uwtable` attribute to LLVM for platforms that require it
for the allocator shims that we generate to ensure that they can hopefully get
unwound past. This is a stab in the dark at helping
https://bugzilla.mozilla.org/show_bug.cgi?id=1456150 along.
…Mark-Simulacrum

Update `parking_lot` dependencies

This commit updates `parking_lot` to pull in Amanieu/parking_lot#70 and...

Closes rust-lang#49438
@kennytm
Copy link
Member Author

kennytm commented Apr 27, 2018

@bors r+ p=8

@bors
Copy link
Contributor

bors commented Apr 27, 2018

📌 Commit e598394 has been approved by kennytm

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 27, 2018
Don't ICE on tuple struct ctor with incorrect arg count

Fix rust-lang#49560.
@kennytm kennytm changed the title Rollup of 8 pull requests Rollup of 9 pull requests Apr 27, 2018
@kennytm
Copy link
Member Author

kennytm commented Apr 27, 2018

@bors r+

Added #50257.

@bors
Copy link
Contributor

bors commented Apr 27, 2018

📌 Commit dc6b167 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Apr 27, 2018

⌛ Testing commit dc6b167 with merge 686d0ae...

bors added a commit that referenced this pull request Apr 27, 2018
Rollup of 9 pull requests

Successful merges:

 - #49858 (std: Mark `ptr::Unique` with `#[doc(hidden)]`)
 - #49968 (Stabilize dyn trait)
 - #50192 (Add some utilities to `libsyntax`)
 - #50251 (rustc: Disable threads in LLD for wasm)
 - #50263 (rustc: Emit `uwtable` for allocator shims)
 - #50269 (Update `parking_lot` dependencies)
 - #50273 (Allow #[inline] on closures)
 - #50284 (fix search load page failure)
 - #50257 (Don't ICE on tuple struct ctor with incorrect arg count)

Failed merges:
@bors
Copy link
Contributor

bors commented Apr 27, 2018

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

9 participants