Skip to content

Rollup of 7 pull requests #64695

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 19 commits into from
Sep 23, 2019
Merged

Rollup of 7 pull requests #64695

merged 19 commits into from
Sep 23, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 22, 2019

Successful merges:

Failed merges:

r? @ghost

wchargin and others added 19 commits September 8, 2019 14:12
Summary:
Invoking `rev` does not add a trailing newline when none is present in
the input (at least on my Debian). Nearby examples use `echo` rather
than `rev`, which probably explains the source of the discrepancy.

Also, a `mut` qualifier is unused.

Test Plan:
Copy the code block into <https://play.rust-lang.org> with a `fn main`
wrapper, and run it. Note that it compiles and runs cleanly; prior to
this commit, it would emit an `unused_mut` warning and then panic.

wchargin-branch: stdio-piped-docs
also removed some duplicated logic from TypeRelation methods.
… r=Dylan-DPC

Fix `Stdio::piped` example code and lint

Summary:
Invoking `rev` does not add a trailing newline when none is present in
the input (at least on my Debian). Nearby examples use `echo` rather
than `rev`, which probably explains the source of the discrepancy.

Also, a `mut` qualifier is unused.

Test Plan:
Copy the code block into <https://play.rust-lang.org> with a `fn main`
wrapper, and run it. Note that it compiles and runs cleanly; prior to
this commit, it would emit an `unused_mut` warning and then panic.

wchargin-branch: stdio-piped-docs
… r=petrochenkov

Cleanup syntax::ext::build

I suspect most of this code could be inlined but I only removed the bits where the inlining didn't really hurt readability (i.e., method call -> function call) or the completely unused code.
…tril

Propagate `types.err` in locals further to avoid spurious knock-down errors

Fix rust-lang#33575, fix rust-lang#44504.
…c, r=petrochenkov

Parse assoc type bounds in generic params and provide custom diagnostic

Fix rust-lang#26271.
Infer consts more consistently

Moved some duplicated logic in `TypeRelation` methods into `super_combined_consts`. Before some `TypeRelation`s like `Lub` wasn't using `replace_if_possible`, meaning some inference types were staying around longer than they should be.

Fixes rust-lang#64519

r? @varkor
@Centril
Copy link
Contributor Author

Centril commented Sep 23, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Collaborator

bors commented Sep 23, 2019

📌 Commit 55df97c 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 Sep 23, 2019
@bors
Copy link
Collaborator

bors commented Sep 23, 2019

⌛ Testing commit 55df97c with merge b6716a1...

bors added a commit that referenced this pull request Sep 23, 2019
Rollup of 7 pull requests

Successful merges:

 - #64294 (Fix `Stdio::piped` example code and lint)
 - #64670 (Cleanup syntax::ext::build)
 - #64674 (Propagate `types.err` in locals further to avoid spurious knock-down errors)
 - #64676 (Parse assoc type bounds in generic params and provide custom diagnostic)
 - #64677 (remove outdated comment)
 - #64679 (Infer consts more consistently)
 - #64688 (Clarify the "since" tidy check)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Sep 23, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2019
@bors bors merged commit 55df97c into rust-lang:master Sep 23, 2019
@Centril Centril deleted the rollup-t1xnl2c branch September 23, 2019 13:01
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 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.

7 participants