Skip to content

Commit 44614a2

Browse files
committed
Auto merge of #154412 - JonathanBrouwer:rollup-4EpQJse, r=JonathanBrouwer
Rollup of 2 pull requests Successful merges: - rust-lang/rust#154229 (Ensure `ErasedData` only implements appropriate auto traits) - rust-lang/rust#154409 (Update `try_blocks` to a new tracking issue number)
2 parents 4681e9e + 07e9777 commit 44614a2

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

crates/ide-db/src/generated/lints.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11576,9 +11576,9 @@ The tracking issue for this feature is: [#85731]
1157611576
label: "try_blocks",
1157711577
description: r##"# `try_blocks`
1157811578

11579-
The tracking issue for this feature is: [#31436]
11579+
The tracking issue for this feature is: [#154391]
1158011580

11581-
[#31436]: https://github.com/rust-lang/rust/issues/31436
11581+
[#154391]: https://github.com/rust-lang/rust/issues/154391
1158211582

1158311583
------------------------
1158411584

@@ -11590,14 +11590,14 @@ block creates a new scope one can use the `?` operator in.
1159011590

1159111591
use std::num::ParseIntError;
1159211592

11593-
let result: Result<i32, ParseIntError> = try {
11593+
let result = try {
1159411594
"1".parse::<i32>()?
1159511595
+ "2".parse::<i32>()?
1159611596
+ "3".parse::<i32>()?
1159711597
};
1159811598
assert_eq!(result, Ok(6));
1159911599

11600-
let result: Result<i32, ParseIntError> = try {
11600+
let result = try {
1160111601
"1".parse::<i32>()?
1160211602
+ "foo".parse::<i32>()?
1160311603
+ "3".parse::<i32>()?

0 commit comments

Comments
 (0)