Rollup of 7 pull requests #64901
Closed
Rollup of 7 pull requests #64901
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When given `struct Foo(usize)` and using it as `Foo {}` or `Foo`, point at
`Foo`'s definition in the error.
When encountering code like the following:
```rust
fn main() {
match 3 {
4 => 1,
3 => {
println!("Yep it maches.");
2
}
_ => 2
}
println!("Bye!")
}
```
point at the enclosing `match` expression and suggest ignoring the
returned value:
```
error[E0308]: mismatched types
--> $DIR/match-needing-semi.rs:8:13
|
LL | / match 3 {
LL | | 4 => 1,
LL | | 3 => {
LL | | 2
| | ^ expected (), found integer
LL | | }
LL | | _ => 2
LL | | }
| | -- help: consider using a semicolon here
| |_____|
| expected this to be `()`
|
= note: expected type `()`
found type `{integer}
```
Fix rust-lang#40799.
Fuse parsing of `self` into `parse_param_general`.
Point at definition when misusing ADT
When given `struct Foo(usize)` and using it as `Foo {}` or `Foo`, point at `Foo`'s definition in the error.
…-E0533, r=Centril Add long error explanation for E0533 Part of rust-lang#61137
Point at enclosing match when expecting `()` in arm
When encountering code like the following:
```rust
fn main() {
match 3 {
4 => 1,
3 => {
println!("Yep it maches.");
2
}
_ => 2
}
println!("Bye!")
}
```
point at the enclosing `match` expression and suggest ignoring the
returned value:
```
error[E0308]: mismatched types
--> $DIR/match-needing-semi.rs:8:13
|
LL | / match 3 {
LL | | 4 => 1,
LL | | 3 => {
LL | | 2
| | ^ expected (), found integer
LL | | }
LL | | _ => 2
LL | | }
| | -- help: consider using a semicolon here
| |_____|
| expected this to be `()`
|
= note: expected type `()`
found type `{integer}
```
Fix rust-lang#40799.
Add support for relating slices in `super_relate_consts` This allows passing strings as generic arguments. Fixes rust-lang#63773 Fixes rust-lang#60813 r? @varkor
syntax: fix dropping of attribute on first param of non-method assocated fn Fixes rust-lang#64682. The general idea is that we bake parsing of `self` into `parse_param_general` and then we just use standard list parsing. Overall, this simplifies the parsing and makes it more consistent. r? @petrochenkov cc @c410-f3r
Remove legacy grammar Revival of rust-lang#50835 & rust-lang#55545 On the #wg-grammar discord there was agreement that enough progress has been made to be able to remove the legacy grammar. r? @Centril @qmx cc @rust-lang/wg-grammar
fixed typo Accidentally had a typo in rust-lang#64884, sorry!
|
@bors r+ p=7 rollup=never |
|
📌 Commit f39a627 has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit f39a627 with merge 97d03dd4acbbcb92070c03bc1b609cf4bb2d34c1... |
|
@bors r- retry (#64896 (comment)) |
bors
added
S-waiting-on-author
bors
added
the
S-waiting-on-bors
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
()in arm #64825 (Point at enclosing match when expecting()in arm)super_relate_consts#64858 (Add support for relating slices insuper_relate_consts)Failed merges:
r? @ghost