Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:derregr
Aug 22, 2018
Merged

resolve: Continue search in outer scopes after applying derive resolution fallback#53516
bors merged 1 commit into
rust-lang:masterfrom
petrochenkov:derregr

Conversation

@petrochenkov

Copy link
Copy Markdown
Contributor

Fixes#53263

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @estebank

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 20, 2018
@petrochenkovpetrochenkov added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 20, 2018
let opt_module = if let Some(node_id) = record_used_id {
self.hygienic_lexical_parent_with_compatibility_fallback(module, &mut ident.span,
node_id)
node_id, &mut poisoned)

Copy link
Copy Markdown
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
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 20, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 7e8825b has been approved by estebank

@borsbors 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

bors commented Aug 22, 2018

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Aug 22, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 7e8825b into rust-lang:masterAug 22, 2018
@emilyalbiniemilyalbini 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
Copy Markdown
Contributor

Accepting for beta backport: regression fix.

cc @rust-lang/compiler

@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 25, 2018
@emilyalbiniemilyalbini mentioned this pull request Aug 25, 2018
@emilyalbiniemilyalbini 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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

@petrochenkov@rust-highfive@estebank@bors@nikomatsakis@emilyalbini