Unnamed repository; edit this file 'description' to name the repository.
Merge ref '80ad55752e5a' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@80ad55752e5ae6c2d1bc143b819eb8d1c00167d1
Filtered ref: rust-lang/rust-analyzer@7f4e321d306834e90b51ab40bcf0ae3d55ad3272
Upstream diff: https://github.com/rust-lang/rust/compare/1174f784096deb8e4ba93f7e4b5ccb7bb4ba2c55...80ad55752e5ae6c2d1bc143b819eb8d1c00167d1
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/ide-db/src/generated/lints.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs index dedc12aa65..9e6d586008 100644 --- a/crates/ide-db/src/generated/lints.rs +++ b/crates/ide-db/src/generated/lints.rs @@ -11576,9 +11576,9 @@ The tracking issue for this feature is: [#85731] label: "try_blocks", description: r##"# `try_blocks` -The tracking issue for this feature is: [#31436] +The tracking issue for this feature is: [#154391] -[#31436]: https://github.com/rust-lang/rust/issues/31436 +[#154391]: https://github.com/rust-lang/rust/issues/154391 ------------------------ @@ -11590,14 +11590,14 @@ block creates a new scope one can use the `?` operator in. use std::num::ParseIntError; -let result: Result<i32, ParseIntError> = try { +let result = try { "1".parse::<i32>()? + "2".parse::<i32>()? + "3".parse::<i32>()? }; assert_eq!(result, Ok(6)); -let result: Result<i32, ParseIntError> = try { +let result = try { "1".parse::<i32>()? + "foo".parse::<i32>()? + "3".parse::<i32>()? |