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

Merged
merged 14 commits into from
Aug 25, 2019
Merged

Rollup of 6 pull requests #63873

merged 14 commits into from
Aug 25, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Aug 25, 2019

Successful merges:

Failed merges:

r? @ghost

llogiq and others added 14 commits August 13, 2019 21:55
It can return `Err` due to macros being expanded across crates or
files.
Refactor `TinyList::contains` and `len` to iterate instead of recurse

None
Do not suggest `.try_into()` on `i32::from(x)`

Fix rust-lang#63697.
…trochenkov

Suggest calling closure with resolved return type when appropriate

Follow up to rust-lang#63337. CC rust-lang#63100.

```
error[E0308]: mismatched types
  --> $DIR/fn-or-tuple-struct-without-args.rs:46:20
   |
LL |     let closure = || 42;
   |                   -- closure defined here
LL |     let _: usize = closure;
   |                    ^^^^^^^
   |                    |
   |                    expected usize, found closure
   |                    help: use parentheses to call this closure: `closure()`
   |
   = note: expected type `usize`
              found type `[closure@$DIR/fn-or-tuple-struct-without-args.rs:45:19: 45:24]`
```
Modifies how Arg, Arm, Field, FieldPattern and Variant are visited

Part of the necessary work to accomplish rust-lang#63468.
… r=Centril

Don't unwrap the result of `span_to_snippet`

Closes rust-lang#63800
@Centril
Copy link
Contributor Author

Centril commented Aug 25, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Aug 25, 2019

📌 Commit 4d3d06a 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 Aug 25, 2019
@bors
Copy link
Contributor

bors commented Aug 25, 2019

⌛ Testing commit 4d3d06a with merge 9267119...

bors added a commit that referenced this pull request Aug 25, 2019
Rollup of 6 pull requests

Successful merges:

 - #62744 (Refactor `TinyList::contains` and `len` to iterate instead of recurse)
 - #63813 (Do not suggest `.try_into()` on `i32::from(x)`)
 - #63833 (Suggest calling closure with resolved return type when appropriate)
 - #63839 (Ensure miri can do bit ops on pointer values)
 - #63854 (Modifies how Arg, Arm, Field, FieldPattern and Variant are visited)
 - #63859 (Don't unwrap the result of `span_to_snippet`)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Aug 25, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 25, 2019
@bors bors merged commit 4d3d06a into rust-lang:master Aug 25, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #63873!

Tested on commit 9267119.
Direct link to PR: #63873

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @mark-i-m @spastorino @amanjeev, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 25, 2019
Tested on commit rust-lang/rust@9267119.
Direct link to PR: <rust-lang/rust#63873>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rustc-guide on linux: test-pass → test-fail (cc @mark-i-m @spastorino @amanjeev, @rust-lang/infra).
@Centril Centril deleted the rollup-jgglypd branch August 25, 2019 04:28
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.

8 participants