resolve: Some macro resolution refactoring #53471
Merged
Conversation
This file contains 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
|
r? @oli-obk (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
oli-obk
requested changes
Aug 20, 2018
| LL | use nonexistent_module::mac; //~ ERROR unresolved import `nonexistent_module` | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| error[E0601]: `main` function not found in crate `issue_53269` |
There was a problem hiding this comment.
Please remove the noise by adding a main function
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| LL | } } | ||
| LL | m!(); | ||
| | ----- in this macro invocation | ||
| | | ||
| = note: macro-expanded `macro_rules!`s may not shadow existing macros (see RFC 1560) | ||
| note: `panic` could also refer to the macro imported here |
There was a problem hiding this comment.
This refers to "here", but there's nothing shown
src/librustc_resolve/macros.rs
Outdated
| is_attr: bool, | ||
| path_span: Span) | ||
| -> Result<MacroBinding<'a>, Determinacy> { | ||
| crate fn resolve_lexical_macro_path_segment(&mut self, |
There was a problem hiding this comment.
change to block indent to reduce future churn and return type breakup
…resolution code Refactor away `fn resolve_invoc_to_def`
`fn resolve_legacy_scope` can now resolve only to `macro_rules!` items, `fn resolve_lexical_macro_path_segment` is for everything else - modularized macros, preludes
|
Updated. |
oli-obk
approved these changes
Aug 21, 2018
|
@bors r+ |
|
📌 Commit 82619ea has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Aug 21, 2018
resolve: Some macro resolution refactoring Work towards completing #50911 (comment) The last commit also fixes #53269 by not using `def_id()` on `Def::Err` and also fixes #53512.
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Aug 21, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Work towards completing #50911 (comment)
The last commit also fixes #53269 by not using
def_id()onDef::Errand also fixes #53512.