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 #33501

Closed
wants to merge 24 commits into from
Closed

Conversation

alexcrichton and others added 10 commits April 26, 2016 23:35
Sometimes a process may be waited on externally from the standard library, in
which case it can be useful to create a raw `ExitStatus` structure to return.
This commit extends the existing Unix `ExitStatusExt` extension trait and adds a
new Windows-specific `ExitStatusExt` extension trait to do this. The methods are
currently called `ExitStatus::from_raw`.

cc rust-lang#32713
Edited the error explanation for E0509 to clarify dropping of moved fields

Edited the error explanation for E0509 to clarify move out of Drop value language

Fixed typeo in last commit to E0509

Switched to erroneous code wording
A few oversights happened while porting the example from docopt to
getopts.  I retraced all the steps, fixing code and description as
necessary.

Fixes: rust-lang#33422
@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@Manishearth
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented May 8, 2016

📌 Commit 24ff1e0 has been approved by Manishearth

@bors
Copy link
Contributor

bors commented May 8, 2016

⌛ Testing commit 24ff1e0 with merge 6d369a8...

bors added a commit that referenced this pull request May 8, 2016
Rollup of 9 pull requests

- Successful merges: #32900, #33129, #33365, #33383, #33474, #33478, #33480, #33484, #33493
- Failed merges: #33360
@bors
Copy link
Contributor

bors commented May 8, 2016

💔 Test failed - auto-linux-64-opt-rustbuild

@Manishearth
Copy link
Member Author

@bors r+ force

@bors
Copy link
Contributor

bors commented May 8, 2016

📌 Commit c46dc9c has been approved by Manishearth

@bors
Copy link
Contributor

bors commented May 8, 2016

⌛ Testing commit c46dc9c with merge c239881...

@bors
Copy link
Contributor

bors commented May 8, 2016

💔 Test failed - auto-linux-64-opt-rustbuild

@bors
Copy link
Contributor

bors commented May 9, 2016

☔ The latest upstream changes (presumably #33360) made this pull request unmergeable. Please resolve the merge conflicts.

birkenfeld and others added 4 commits May 9, 2016 10:18
The collect() fn checks for double quotes; use them here as well.

Fixes: rust-lang#30219
In `impl<T> Trait for T`, the blanket type parameters `T` were
recognized as "local" and "not exported", so these impls were
thrown out.

Now we check if they are generic, and keep them in that case.

Fixes: rust-lang#29503
…aturon

std: Allow creating ExitStatus from raw values

Sometimes a process may be waited on externally from the standard library, in
which case it can be useful to create a raw `ExitStatus` structure to return.
This commit extends the existing Unix `ExitStatusExt` extension trait and adds a
new Windows-specific `ExitStatusExt` extension trait to do this. The methods are
currently called `ExitStatus::from_raw`.

cc rust-lang#32713
save-analysis: use a decoupled representation for dumped data

Closes rust-lang#33348

This will probably break any tool relying on the csv backend of save_analysis, for the following reasons:

1. Dumped spans don't contain extents anymore (`Dump` uses `SpanData` now instead of internal `Span`s). In case we still want to dump extents we could add them to `SpanData`.
1. `DefId`s are no longer dumped as a pair of `(ref_id, ref_crate)`. Instead, they are dumped as a single `Id`.

@nrc You said something about storing the id in a `u64`, but you didn't explain why. I kept using `u32` in this branch but I can change it if you prefer that.

r? @nrc

By the way, the fact that this breaks tools relying on CSV may be a good occasion to start dumping CSV in a different way (i.e. using the serializer like in the JSON backend).
Add detailed error explanation for E0509

Part of rust-lang#32777
Utilize `Result::unwrap_err` in more places.

None
book: fixup code in error handling tutorial

A few oversights happened while porting the example from docopt to getopts.  I retraced all the steps, fixing code and description as necessary.

Fixes: rust-lang#33422
rustdoc: fix emitting duplicate implementors in .js files

The collect() fn checks for double quotes; use them here as well.

Fixes: rust-lang#30219
rustdoc: do not strip blanket impls in crate of origin

In `impl<T> Trait for T`, the blanket type parameters `T` were recognized as "local" and "not exported", so these impls were thrown out.

Now we check if they are generic, and keep them in that case.

Fixes: rust-lang#29503
@Manishearth Manishearth closed this May 9, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.