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

Rustup #6586

Merged
merged 11 commits into from
Jan 15, 2021
Merged

Rustup #6586

merged 11 commits into from
Jan 15, 2021

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Jan 14, 2021

r? @ghost

changelog: FP fix: [needless_return] no longer triggers inside macros.

flip1995 and others added 7 commits January 2, 2021 16:29
This makes it possible to pass the `Impl` directly to functions, instead
of having to pass each of the many fields one at a time. It also
simplifies matches in many cases.
Rework diagnostics for wrong number of generic args (fixes #66228 and #71924)

This PR reworks the `wrong number of {} arguments` message, so that it provides more details and contextual hints.
@flip1995
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 14, 2021

📌 Commit 77e1d02 has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Jan 14, 2021

⌛ Testing commit 77e1d02 with merge a6ade62...

bors added a commit that referenced this pull request Jan 14, 2021
Rustup

r? `@ghost`

changelog: none
@bors
Copy link
Collaborator

bors commented Jan 14, 2021

💔 Test failed - checks-action_test

Reintroduce hir::ExprKind::If

Basically copied and paste #59288/rust-lang#4080 with some modifications.

The vast majority of tests were fixed and now there are only a few remaining. Since I am still unable to figure out the missing pieces, any help with the following list is welcome.

- [ ] **Unnecessary `typeck` exception**: [Cheated on this one to make CI green.](https://github.com/rust-lang/rust/pull/79328/files#diff-3faee9ba23fc54a12b7c43364ba81f8c5660045c7e1d7989a02a0cee1c5b2051)
- [x] **Incorrect span**: [Span should reference `then` and `else` separately.](https://github.com/rust-lang/rust/pull/79328/files#diff-cf2c46e82222ee4b1037a68fff8a1af3c4f1de7a6b3fd798aacbf3c0475abe3d)
- [x] **New note regarding `assert!`**: [Modified but not "wrong". Maybe can be a good thing?](https://github.com/rust-lang/rust/pull/79328/files#diff-9e0d7c89ed0224e2b62060c957177c27db43c30dfe3c2974cb6b5091cda9cfb5)
- [x] **Inverted report location**: [Modified but not "wrong". Locations were inverted.](https://github.com/rust-lang/rust/pull/79328/files#diff-f637ce7c1f68d523a165aa9651765df05e36c4d7d279194b1a6b28b48a323691)
- [x] **`src/test/ui/point-to-type-err-cause-on-impl-trait-return.rs` has weird errors**: [Not sure why this is happening.](https://github.com/rust-lang/rust/pull/79328/files#diff-c823c09660f5b112f95e97e8ff71f1797b6c7f37dbb3d16f8e98bbaea8072e95)
- [x] **Missing diagnostic**: [???](https://github.com/rust-lang/rust/pull/79328/files#diff-6b8ab09360d725ba4513933827f9796b42ff9522b0690f80b76de067143af2fc)
@flip1995
Copy link
Member Author

Syncing tomorrow. Waiting for the nightly with rust-lang/rust#81003

@flip1995
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented Jan 15, 2021

📌 Commit f18cf82 has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Jan 15, 2021

⌛ Testing commit f18cf82 with merge 953f024...

@bors
Copy link
Collaborator

bors commented Jan 15, 2021

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 953f024 to master...

@bors bors merged commit 953f024 into rust-lang:master Jan 15, 2021
@flip1995 flip1995 deleted the rustup branch January 15, 2021 10:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants