Uh oh!
There was an error while loading. Please reload this page.
Allow try blocks as the argument to return expressions - #76274
Merged
Conversation
rust-highfive
commented
Sep 3, 2020
Contributor
(rust_highfive has picked a reviewer for you, use r? to override) |
matklad
commented
Sep 3, 2020
Contributor
estebank
approved these changes
Sep 3, 2020
petrochenkov
commented
Sep 3, 2020
Contributor
@bors r+ rollup |
bors
commented
Sep 3, 2020
Collaborator
📌 Commit 791f93c has been approved by |
matklad added a commit
to matklad/rust
that referenced
this pull request
Sep 4, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
matklad added a commit
to matklad/rust
that referenced
this pull request
Sep 4, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
matklad added a commit
to matklad/rust
that referenced
this pull request
Sep 4, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
matklad added a commit
to matklad/rust
that referenced
this pull request
Sep 4, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
matklad added a commit
to matklad/rust
that referenced
this pull request
Sep 4, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
Dylan-DPC-zz pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Sep 5, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
Dylan-DPC-zz pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Sep 5, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
Dylan-DPC-zz pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Sep 6, 2020
Allow try blocks as the argument to return expressions Fixesrust-lang#76271 I don't think this needs to be edition-aware (phew) since `return try` in 2015 is also the start of an expression, just with a struct literal instead of a block (`return try { x: 4, y: 5 }`).
This was referenced Sep 6, 2020
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 7, 2020
Rollup of 18 pull requests Successful merges: - rust-lang#76273 (Move some Vec UI tests into alloc unit tests) - rust-lang#76274 (Allow try blocks as the argument to return expressions) - rust-lang#76287 (Remove an unnecessary allowed lint) - rust-lang#76293 (Implementation of incompatible features error) - rust-lang#76299 (Make `Ipv4Addr` and `Ipv6Addr` const tests unit tests under `library`) - rust-lang#76302 (Address review comments on `Peekable::next_if`) - rust-lang#76303 (Link to `#capacity-and-reallocation` when using with_capacity) - rust-lang#76305 (Move various ui const tests to `library`) - rust-lang#76309 (Indent a note to make folding work nicer) - rust-lang#76312 (time.rs: Make spelling of "Darwin" consistent) - rust-lang#76318 (Use ops::ControlFlow in rustc_data_structures::graph::iterate) - rust-lang#76324 (Move Vec slice UI tests in library) - rust-lang#76338 (add some intra-doc links to `Iterator`) - rust-lang#76340 (Remove unused duplicated `trivial_dropck_outlives`) - rust-lang#76344 (Improve docs for `std::env::args()`) - rust-lang#76346 (Docs: nlink example typo) - rust-lang#76358 (Minor grammar fix in doc comment for soft-deprecated methods) - rust-lang#76364 (Disable atomics on avr target.) Failed merges: - rust-lang#76304 (Make delegation methods of `std::net::IpAddr` unstably const) r? @ghost
scottmcm added a commit
to scottmcm/rust
that referenced
this pull request
Oct 13, 2020
To pick up rust-lang/rustfmt#4461 So that rustfmt has the parsing fix from rust-lang#76274 ...and do a reformat that it wants.
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
Fixes#76271
I don't think this needs to be edition-aware (phew) since
return tryin 2015 is also the start of an expression, just with a struct literal instead of a block (return try { x: 4, y: 5 }).