]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4720126 ee05f6e)
Rollup merge of #54518 - petrochenkov:regr130, r=alexcrichton
authorPietro Albini <pietro@pietroalbini.org>
Tue, 25 Sep 2018 20:34:43 +0000 (22:34 +0200)
committerGitHub <noreply@github.com>
Tue, 25 Sep 2018 20:34:43 +0000 (22:34 +0200)
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


Trivial merge
Empowering everyone to build reliable and efficient software.