about summary refs log tree commit diff
path: root/src/rustllvm
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2018-09-25 22:34:43 +0200
committerGitHub <noreply@github.com>2018-09-25 22:34:43 +0200
commitcf3c385fef4d8bc071f51ecdb1004e73c7fe8a9b (patch)
treee2b627785c1a3a26104ac74b71c4e749fc525cbd /src/rustllvm
parent4720126c16b4cc961b04942a30d5d6db86edfaeb (diff)
parentee05f6eef4f97188a94874eacf2dad59f9f11f47 (diff)
downloadrust-cf3c385fef4d8bc071f51ecdb1004e73c7fe8a9b.tar.gz
rust-cf3c385fef4d8bc071f51ecdb1004e73c7fe8a9b.zip
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
Diffstat (limited to 'src/rustllvm')
0 files changed, 0 insertions, 0 deletions