From: Pietro Albini Date: Tue, 25 Sep 2018 20:34:43 +0000 (+0200) Subject: Rollup merge of #54518 - petrochenkov:regr130, r=alexcrichton X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=cf3c385fef4d8bc071f51ecdb1004e73c7fe8a9b;p=rust.git Rollup merge of #54518 - petrochenkov:regr130, r=alexcrichton resolve: Do not block derive helper resolutions on single import resolutions Derive helpers currently conflict with anything else, so if some resolution from a single import appears later, it will result in error anyway. Fixes https://github.com/rust-lang/rust/issues/54471 (stable-to-beta regression) r? @ghost --- cf3c385fef4d8bc071f51ecdb1004e73c7fe8a9b