Skip to content

Rollup of 8 pull requests #67419

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 22 commits into from
Dec 19, 2019
Merged

Rollup of 8 pull requests #67419

merged 22 commits into from
Dec 19, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 19, 2019

Successful merges:

Failed merges:

r? @ghost

LeSeulArtichaut and others added 22 commits December 12, 2019 20:56
This commit implements the `write_vectored` method of the `LineWriter`
type. First discovered in bytecodealliance/wasmtime#629 the
`write_vectored` method of `Stdout` bottoms out here but only ends up
writing the first buffer due to the default implementation of
`write_vectored`.

Like `BufWriter`, however, `LineWriter` can have a non-default
implementation of `write_vectored` which tries to preserve the
vectored-ness as much as possible. Namely we can have a vectored write
for everything before the newline and everything after the newline if
all the stars align well.

Also like `BufWriter`, though, special care is taken to ensure that
whenever bytes are written we're sure to signal success since that
represents a "commit" of writing bytes.
The actual fields in `config.toml.example` have dashes, not underscores.
…, r=sfackler

std: Implement `LineWriter::write_vectored`

This commit implements the `write_vectored` method of the `LineWriter`
type. First discovered in bytecodealliance/wasmtime#629 the
`write_vectored` method of `Stdout` bottoms out here but only ends up
writing the first buffer due to the default implementation of
`write_vectored`.

Like `BufWriter`, however, `LineWriter` can have a non-default
implementation of `write_vectored` which tries to preserve the
vectored-ness as much as possible. Namely we can have a vectored write
for everything before the newline and everything after the newline if
all the stars align well.

Also like `BufWriter`, though, special care is taken to ensure that
whenever bytes are written we're sure to signal success since that
represents a "commit" of writing bytes.
Fix the configure.py TOML field for a couple LLVM options

The actual fields in `config.toml.example` have dashes, not underscores.
make htons const fn

This may partially help rust-lang#67315.
…stants, r=michaelwoerister

Remove some unnecessary `ATTR_*` constants.

r? @michaelwoerister
…master

Remove `SO_NOSIGPIPE` dummy variable on platforms that don't use it.
…docs, r=Dylan-DPC

Remove outdated references to @t from comments

Closes rust-lang#67341.

This removes all references to `@T` from the comment in libsyntax/ptr.rs.
…ebank

Suggest associated type when the specified one cannot be found

Fixes rust-lang#67386, so code like this:
```
use std::ops::Deref;

fn homura<T: Deref<Trget = i32>>(_: T) {}

fn main() {}
```

results in:
```
error[E0220]: associated type `Trget` not found for `std::ops::Deref`
 --> type-binding.rs:6:20
  |
6 | fn homura<T: Deref<Trget = i32>>(_: T) {}
  |                    ^^^^^^^^^^^ help: there is an associated type with a similar name: `Target`

error: aborting due to previous error
```

(The `help` is new)

I used an `all_candidates: impl Fn() -> Iterator<...>` instead of `collect`ing to avoid the cost of allocating the Vec when no errors are found, at the expense of a little added complexity.

r? @estebank
@Centril
Copy link
Contributor Author

Centril commented Dec 19, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Collaborator

bors commented Dec 19, 2019

📌 Commit 06985c6 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 Dec 19, 2019
@Centril Centril added the rollup A PR which is a rollup label Dec 19, 2019
@bors
Copy link
Collaborator

bors commented Dec 19, 2019

⌛ Testing commit 06985c6 with merge 0de96d3...

bors added a commit that referenced this pull request Dec 19, 2019
Rollup of 8 pull requests

Successful merges:

 - #67189 (Unify binop wording)
 - #67270 (std: Implement `LineWriter::write_vectored`)
 - #67286 (Fix the configure.py TOML field for a couple LLVM options)
 - #67321 (make htons const fn)
 - #67382 (Remove some unnecessary `ATTR_*` constants.)
 - #67389 (Remove `SO_NOSIGPIPE` dummy variable on platforms that don't use it.)
 - #67394 (Remove outdated references to @t from comments)
 - #67406 (Suggest associated type when the specified one cannot be found)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Dec 19, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 0de96d3 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 19, 2019
# for free to join this conversation on GitHub. Already have an account? # 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.

9 participants