]> git.lizzy.rs Git - rust.git/commit
Auto merge of #4123 - Centril:rustup-let-chains-ast, r=Manishearth
authorbors <bors@rust-lang.org>
Mon, 24 Jun 2019 05:21:52 +0000 (05:21 +0000)
committerbors <bors@rust-lang.org>
Mon, 24 Jun 2019 05:21:52 +0000 (05:21 +0000)
commit8c80b65f10213c6e5f4c6d8113e8f8c9477af568
tree9bc03c6d06b06df5e11a1dcea6f453babd003cac
parentc5d1ecd4747d73e0c8a62b82b97cb6d5f83db45f
parent46a0e5436155ee8d48c1d9d73b2bb7c7ed60e33c
Auto merge of #4123 - Centril:rustup-let-chains-ast, r=Manishearth

Fix fallout from rust-lang/rust PR 60861

Fixes incoming breakage for unlanded https://github.com/rust-lang/rust/pull/60861.

Tests are passing locally; the Rust PR now needs to land first.

@Manishearth also says we'll want to split out to a `collapsible_if_let` once we have let-chains working in Rust nightly or something.