]> git.lizzy.rs Git - rust.git/commit
projects / rust.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitcf3c385fef4d8bc071f51ecdb1004e73c7fe8a9b
treee2b627785c1a3a26104ac74b71c4e749fc525cbdtree | snapshot
parent4720126c16b4cc961b04942a30d5d6db86edfaebcommit | diff
parentee05f6eef4f97188a94874eacf2dad59f9f11f47commit | diff
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
Empowering everyone to build reliable and efficient software.