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 6 pull requests #59741

Merged
merged 17 commits into from Apr 6, 2019
Merged

Rollup of 6 pull requests #59741

merged 17 commits into from Apr 6, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 5, 2019

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 17 commits March 31, 2019 15:32
This commit updates the wasi target with supported added in
WebAssembly/wasi-libc#10. That function allows both C and Rust to
cooperate in how preopened files are managed, enabling us to learn about
propened files through the same interface. The `open_parent` function in
the wasi `fs` module was updated to avoid its own initialization of a
global preopened map and instead delegate to libc to perform this
functionality.

This should both be more robust into the future in terms of handling
path logic as well as ensuring the propened map is correctly set up at
process boot time. This does currently require some unfortunate
allocations on our side, but if that becomes an issue we can always
paper over those in time!
Co-Authored-By: XAMPPRocky <4464295+XAMPPRocky@users.noreply.github.com>
…nds, r=estebank

Fix invalid bounds string generation in rustdoc

Fixes rust-lang#58737.

Very weird and I'm not sure this is the best fix around. However, trying to fix it beforehand seems overly complicated compared to the gain (in `clean`, it wouldn't change anything since we **have to** return something so that wouldn't work, and in `hir`, I'm afraid I'd break something else for very little gain).

Also, I wasn't able to make a small code to reproduce the issue. The only way to test is to document `crossbeam` directly and check the `Scope` struct...

r? @QuietMisdreavus
Updated RELEASES.md for 1.34.0

[Rendered](https://github.com/XAMPPRocky/rust/blob/master/RELEASES.md)

This also corrects an omission in the previous 1.33.0 release.

r? @Mark-Simulacrum

cc @rust-lang/release
…crichton

SGX target: Use linker option to avoid code CGU assignment kludge

cc @VardhanThigle @faern
…=alexcrichton

Remove invalid assertion back::link::from add_upstream_rust_crates().

This removes a misplaced assertion. The function containing the assertion is actually only ever called for upstream crates that are not considered for LTO, so we don't care whether upstream code has been merged in by LTO or not.

Fixes rust-lang#59137

r? @alexcrichton
…-1, r=Centril

Add missing tryfrom example

r? @rust-lang/docs
wasi: Use shared API for preopened fds

This commit updates the wasi target with supported added in
WebAssembly/wasi-libc#10. That function allows both C and Rust to
cooperate in how preopened files are managed, enabling us to learn about
propened files through the same interface. The `open_parent` function in
the wasi `fs` module was updated to avoid its own initialization of a
global preopened map and instead delegate to libc to perform this
functionality.

This should both be more robust into the future in terms of handling
path logic as well as ensuring the propened map is correctly set up at
process boot time. This does currently require some unfortunate
allocations on our side, but if that becomes an issue we can always
paper over those in time!
@Centril
Copy link
Contributor Author

Centril commented Apr 5, 2019

@bors r+ p=6

@bors
Copy link
Contributor

bors commented Apr 5, 2019

📌 Commit 8455818 has been approved by Centril

@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 5, 2019
@bors
Copy link
Contributor

bors commented Apr 5, 2019

⌛ Testing commit 8455818 with merge 05b4554...

bors added a commit that referenced this pull request Apr 5, 2019
Rollup of 6 pull requests

Successful merges:

 - #58894 (Fix invalid bounds string generation in rustdoc)
 - #59599 (Updated RELEASES.md for 1.34.0)
 - #59624 (SGX target: Use linker option to avoid code CGU assignment kludge)
 - #59696 (Remove invalid assertion back::link::from add_upstream_rust_crates().)
 - #59707 (Add missing tryfrom example)
 - #59727 (wasi: Use shared API for preopened fds)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Apr 6, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 05b4554 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors label Apr 6, 2019
@bors bors merged commit 8455818 into rust-lang:master Apr 6, 2019
@Centril Centril deleted the rollup-3us4b8q branch April 6, 2019 01:36
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors 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.

None yet

6 participants