]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4db0b32 92bc3ea)
Auto merge of #22767 - pnkfelix:issue-22265, r=nikomatsakis
authorbors <bors@rust-lang.org>
Wed, 25 Feb 2015 23:08:53 +0000 (23:08 +0000)
committerbors <bors@rust-lang.org>
Wed, 25 Feb 2015 23:08:53 +0000 (23:08 +0000)
commit610d1695d1e0f1bb4e59449d8ba70409b1dc610c
tree77ae9062e388e9b5bb87a3b0f5a8bd41c7a21383tree | snapshot
parent4db0b32467535d718d6474de7ae8d1007d900818commit | diff
parent92bc3ea46770573bc734c2d0c3e7acfea020e8a7commit | diff
Auto merge of #22767 - pnkfelix:issue-22265, r=nikomatsakis

Avoid `cat_expr Erred` notes when already in error state.

Also, to ensure we do not let the dropck get skipped, ICE if `cat_expr` errors when *not* in error state.

This is not known to be a breaking change (i.e. I do not know of a current case that causes the new ICE to be exercised).

Fix #22265
Empowering everyone to build reliable and efficient software.