Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve: Continue search in outer scopes after applying derive resolution fallback #53516

Merged
merged 1 commit into from
Aug 22, 2018

Conversation

petrochenkov
Copy link
Contributor

Fixes #53263

@rust-highfive
Copy link
Collaborator

r? @estebank

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 20, 2018
@petrochenkov petrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 20, 2018
self.hygienic_lexical_parent_with_compatibility_fallback(module, &mut ident.span,
node_id)
node_id, &mut poisoned)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find mutable arguments to be a bit stylistically unappealing, in Rust in particular. You could do something like the following:

if let ... {
    let (module, poisoned_opt) = self.hygienic_lexical_parent_with_compatibility_fallback(...);
    poisoned = poisoned_opt;
    module
} else {

although I'm not seeing it as much of an improvement...

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Aug 20, 2018

📌 Commit 7e8825b has been approved by estebank

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2018
@bors
Copy link
Contributor

bors commented Aug 22, 2018

⌛ Testing commit 7e8825b with merge 71a1ef1...

bors added a commit that referenced this pull request Aug 22, 2018
resolve: Continue search in outer scopes after applying derive resolution fallback

Fixes #53263
@bors
Copy link
Contributor

bors commented Aug 22, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: estebank
Pushing 71a1ef1 to master...

@bors bors merged commit 7e8825b into rust-lang:master Aug 22, 2018
@pietroalbini pietroalbini added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 25, 2018
@nikomatsakis
Copy link
Contributor

Accepting for beta backport: regression fix.

cc @rust-lang/compiler

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 25, 2018
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 25, 2018
bors added a commit that referenced this pull request Aug 25, 2018
[beta] Rollup backports

Merged and approved:

* #53559: add macro check for lint
* #53509: resolve: Reject some inaccessible candidates sooner during import resolution
* #53239: rustc_codegen_llvm: Restore the closure env alloca hack for LLVM 5.
* #53235: Feature gate where clauses on associated type impls
* #53516: resolve: Continue search in outer scopes after applying derive resolution fallback

r? @ghost
@petrochenkov petrochenkov deleted the derregr branch June 5, 2019 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants