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: Improve candidate search for unresolved macro suggestions #62684

Merged
merged 8 commits into from Jul 19, 2019

Conversation

@petrochenkov
Copy link
Contributor

commented Jul 15, 2019

Use same scope visiting machinery for both collecting suggestion candidates and actually resolving the names.

The PR is better read in per-commit fashion with whitespace changes ignored (the first commit in particular moves some code around).

This should be the last pre-requisite for #62086.
r? @davidtwco

@petrochenkov petrochenkov force-pushed the petrochenkov:scopevisit branch from 0796f89 to 4ffa0bb Jul 15, 2019

@davidtwco
Copy link
Member

left a comment

LGTM, r=me if you're happy with this.

@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

commented Jul 17, 2019

@bors r=davidtwco
I'm already happy 😄

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 17, 2019

📌 Commit 4ffa0bb has been approved by davidtwco

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 18, 2019

☔️ The latest upstream changes (presumably #62669) made this pull request unmergeable. Please resolve the merge conflicts.

petrochenkov added some commits Jul 11, 2019

resolve: Rename `WhereToResolve` into `Scope`
Also move it into the crate root, it's no longer used for macros only
resolve: Use `feature(custom_attribute)` fallback only if the feature…
… is enabled

Normally `#![feature(...)]` shouldn't change behavior, but custom attributes in particular are in the process of retirement, and we should not produce a message telling to enable them.
It also helps with unifying diagnostics for unresolved macros.

@petrochenkov petrochenkov force-pushed the petrochenkov:scopevisit branch from 4ffa0bb to 1b4fbfc Jul 18, 2019

@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

commented Jul 18, 2019

@bors r=davidtwco

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 18, 2019

📌 Commit 1b4fbfc has been approved by davidtwco

@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 19, 2019

⌛️ Testing commit 1b4fbfc with merge fe499a7...

bors added a commit that referenced this pull request Jul 19, 2019

Auto merge of #62684 - petrochenkov:scopevisit, r=davidtwco
resolve: Improve candidate search for unresolved macro suggestions

Use same scope visiting machinery for both collecting suggestion candidates and actually resolving the names.

The PR is better read in per-commit fashion with whitespace changes ignored (the first commit in particular moves some code around).

This should be the last pre-requisite for #62086.
r? @davidtwco
@bors

This comment has been minimized.

Copy link
Contributor

commented Jul 19, 2019

☀️ Test successful - checks-azure
Approved by: davidtwco
Pushing fe499a7 to master...

@bors bors added the merged-by-bors label Jul 19, 2019

@bors bors merged commit 1b4fbfc into rust-lang:master Jul 19, 2019

5 checks passed

homu Test successful
Details
pr Build #20190718.13 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.