resolve: Do not block derive helper resolutions on single import resolutions#54518
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 26, 2018
Merged
resolve: Do not block derive helper resolutions on single import resolutions#54518bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Contributor
Author
|
r? @alexcrichton |
petrochenkov
added
beta-nominated
src/librustc_resolve/macros.rs
Outdated
Member
There was a problem hiding this comment.
I think this comment may need an update?
I think the large comment above this one may also need a slight tweak?
Contributor
Author
There was a problem hiding this comment.
No, we are still going through scopes and trying to resolve, just in slightly different order.
I've updated the larger comment above.
Member
|
r=me with the comment tweaks, thanks! |
…lutions Derive helpers conflict currently conflict with anything else, so if some resolution from a single import appears later, it will result in error anyway
petrochenkov
force-pushed
the
regr130
branch
from
fa6b97c to
ee05f6e
Compare
Contributor
Author
|
@bors r=alexcrichton |
Collaborator
|
📌 Commit ee05f6e has been approved by |
bors
added
S-waiting-on-bors
emilyalbini
added a commit
to emilyalbini/rust
that referenced
this pull request
Sep 25, 2018
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 rust-lang#54471 (stable-to-beta regression) r? @ghost
bors
added a commit
that referenced
this pull request
Sep 25, 2018
Rollup of 12 pull requests Successful merges: - #53518 (Add doc for impl From in char_convert) - #54058 (Introduce the partition_dedup/by/by_key methods for slices) - #54281 (Search box) - #54368 (Reduce code block sides padding) - #54498 (The project moved under the Mozilla umbrella) - #54518 (resolve: Do not block derive helper resolutions on single import resolutions) - #54522 (Fixed three small typos.) - #54529 (aarch64-pc-windows-msvc: Don't link libpanic_unwind to libtest.) - #54537 (Rename slice::exact_chunks() to slice::chunks_exact()) - #54539 (Fix js error) - #54557 (incr.comp.: Don't automatically enable -Zshare-generics for incr. comp. builds.) - #54558 (Improvements to finding LLVM's FileCheck) Failed merges: r? @ghost
Collaborator
emilyalbini
added
the
T-compiler
oli-obk
added
beta-accepted
Contributor
|
re-adding beta-nominated so that this will (hopefully) be enqueued for backport |
pnkfelix
added
the
beta-nominated
emilyalbini
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Oct 2, 2018
[beta] Rollup backports Merged and approved: * #54650: Don't lint non-extern-prelude extern crate's in Rust 2018. * #54338: Use full name to identify a macro in a `FileName`. * #54518: resolve: Do not block derive helper resolutions on single import resolutions * #54581: Accept trailing comma in `cfg_attr` r? @ghost
bors
added a commit
that referenced
this pull request
Oct 2, 2018
[beta] Rollup backports Merged and approved: * #54650: Don't lint non-extern-prelude extern crate's in Rust 2018. * #54338: Use full name to identify a macro in a `FileName`. * #54518: resolve: Do not block derive helper resolutions on single import resolutions * #54581: Accept trailing comma in `cfg_attr` r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Derive helpers currently conflict with anything else, so if some resolution from a single import appears later, it will result in error anyway.
Fixes #54471 (stable-to-beta regression)
r? @ghost