Merge pull request rust-lang#2548 from topecongiro/match-mod

Do not collapse block around expr with condition on match arm

Author: nrc