Skip to content

Rollup of 11 pull requests - #39645

Merged
bors merged 25 commits into
rust-lang:masterfrom
frewsxcv:rollup
Feb 8, 2017
Merged

Rollup of 11 pull requests#39645
bors merged 25 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

emilioand others added 25 commits February 3, 2017 22:00
LLVM 4.0 changes this. This change is fine to make for LLVM 3.9 as we
won't have alignments greater than 2^32-1.
* Moved algorithm explanation to module docs
* Added ``` before and after the examples
* Explanation of the `rbox`, `ibox` and `cbox` names
* Added docs about the breaking types to `Breaks`
This is much nicer for callers who want to short-circuit real I/O errors
with `?`, because they can write this
if let Some(status) = foo.try_wait()? {
...
} else {
...
}
instead of this
match foo.try_wait() {
Ok(status) => {
...
}
Err(err) if err.kind() == io::ErrorKind::WouldBlock => {
...
}
Err(err) => return Err(err),
}
The original design of `try_wait` was patterned after the `Read` and
`Write` traits, which support both blocking and non-blocking
implementations in a single API. But since `try_wait` is never blocking,
it makes sense to optimize for the non-blocking case.
Tracking issue: rust-lang#38903
Prevents stale artifacts from sticking around by accident!
The current manifests encode this with a dash in the name, so we should preserve
that!
lint/ctypes: Don't warn on sized structs with PhantomData.
Fixesrust-lang#34798
make Child::try_wait return io::Result<Option<ExitStatus>>
This is much nicer for callers who want to short-circuit real I/O errors
with `?`, because they can write this
if let Some(status) = foo.try_wait()? {
...
} else {
...
}
instead of this
match foo.try_wait() {
Ok(status) => {
...
}
Err(err) if err.kind() == io::ErrorKind::WouldBlock => {
...
}
Err(err) => return Err(err),
}
The original design of `try_wait` was patterned after the `Read` and
`Write` traits, which support both blocking and non-blocking
implementations in a single API. But since `try_wait` is never blocking,
it makes sense to optimize for the non-blocking case.
Tracking issue: rust-lang#38903
…crichton
[LLVM 4.0] Use 32-bits for alignment
LLVM 4.0 changes this. This change is fine to make for LLVM 3.9 as we
won't have alignments greater than 2^32-1.
A few documentation improvements for `syntax::print::pp`
* Moved algorithm explanation to module docs
* Added ``` before and after the examples
* Explanation of the `rbox`, `ibox` and `cbox` names
* Added docs about the breaking types to `Breaks`
…lexcrichton
Extract collections benchmarks to libcollections/bench
Good suggestion from @stjepangrust-lang#39484 (comment)
r? @alexcrichton
… r=michaelwoerister
Handle the case where an intermediate node can't be recreated
This solution grows the graph, but this is quite the corner case.
r? @michaelwoerister
…, r=nikomatsakis
back: Limit the number of LLVM worker threads.
This should fix issue rust-lang#39568.
Also see rust-lang#39280.
r? @nikomatsakis
…_file, r=alexcrichton
Display correct filename with --test option
Fixesrust-lang#39592.
With the current files:
```rust
pub mod foo;
/// This is a Foo;
///
/// ```
/// println!("baaaaaar");
/// ```
pub struct Foo;
/// This is a Bar;
///
/// ```
/// println!("fooooo");
/// ```
pub struct Bar;
```
```rust
// note the whitespaces
/// ```
/// println!("foo");
/// ```
pub fn foo() {}
```
It displays:
```
./build/x86_64-apple-darwin/stage1/bin/rustdoc --test test.rs
running 3 tests
test test.rs - line 13 ... ok
test test.rs - line 5 ... ok
test foo.rs - line 2 ... ok
test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured
```
```
` ``
println!("lol");
` ``
asdjnfasd
asd
```
It displays:
```
./build/x86_64-apple-darwin/stage1/bin/rustdoc --test foo.md
running 1 test
test <input> - line 3 ... ok
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
```
r? @alexcrichton
rustbuild: Clean build/dist on `make clean`
Prevents stale artifacts from sticking around by accident!
Rename manifest_version to manifest-version
The current manifests encode this with a dash in the name, so we should preserve
that!
@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sfackler (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented Feb 8, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 62d2267 has been approved by frewsxcv

@bors

bors commented Feb 8, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 62d2267 with merge 48e4925...

@bors

bors commented Feb 8, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors retry #39523

@bors

bors commented Feb 8, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 62d2267 with merge 4379e2f...

bors added a commit that referenced this pull request Feb 8, 2017
Rollup of 11 pull requests
- Successful merges: #39462, #39512, #39529, #39557, #39561, #39582, #39583, #39597, #39622, #39624, #39630
- Failed merges:
@bors

bors commented Feb 8, 2017

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing 4379e2f to master...

@bors
bors merged commit 62d2267 into rust-lang:masterFeb 8, 2017
@frewsxcv
frewsxcv deleted the rollup branch February 8, 2017 20:49
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

14 participants

@frewsxcv@rust-highfive@bors@Centril@sfackler@emilio@phungleson@nikomatsakis@michaelwoerister@bjorn3@GuillaumeGomez@oconnor663@alexcrichton@brson