Point at macro definition when no rules expect token#55298
Merged
bors merged 2 commits intorust-lang:masterfrom Oct 26, 2018
Merged
Point at macro definition when no rules expect token#55298bors merged 2 commits intorust-lang:masterfrom
bors merged 2 commits intorust-lang:masterfrom
Conversation
Contributor
|
r? @pnkfelix (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
pnkfelix
reviewed
Oct 24, 2018
| LL | | ($a:ident, $b:ident, $c:ident, $d:ident) => (); | ||
| LL | | ($a:ident, $b:ident, $c:ident, $d:ident, $e:ident) => (); | ||
| LL | | } | ||
| | |_- when calling this macro |
Contributor
There was a problem hiding this comment.
do we want to highlight the whole definition? Might we be better off just highlighting the macro_rules! foo portion?
Contributor
Author
There was a problem hiding this comment.
As is it will only ever show 7 lines, at most of the macro. For the simple case that's enough to spot the problem without having to dig for the source. Having said that, I can change the PR to only point at the macro_rules! foo portion if needed.
pnkfelix
added
S-waiting-on-author
estebank
added
S-waiting-on-review
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit 1ab45ec has been approved by |
bors
added
S-waiting-on-bors
Contributor
Author
|
@bors rollup |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Oct 26, 2018
Point at macro definition when no rules expect token Fix rust-lang#35150.
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Oct 26, 2018
Point at macro definition when no rules expect token Fix rust-lang#35150.
bors
added a commit
that referenced
this pull request
Oct 26, 2018
Rollup of 21 pull requests Successful merges: - #54816 (Don't try to promote already promoted out temporaries) - #54824 (Cleanup rustdoc tests with `@!has` and `@!matches`) - #54921 (Add line numbers option to rustdoc) - #55167 (Add a "cheap" mode for `compute_missing_ctors`.) - #55258 (Fix Rustdoc ICE when checking blanket impls) - #55264 (Compile the libstd we distribute with -Ccodegen-unit=1) - #55271 (Unimplement ExactSizeIterator for MIR traversing iterators) - #55292 (Macro diagnostics tweaks) - #55298 (Point at macro definition when no rules expect token) - #55301 (List allowed tokens after macro fragments) - #55302 (Extend the impl_stable_hash_for! macro for miri.) - #55325 (Fix link to macros chapter) - #55343 (rustbuild: fix remap-debuginfo when building a release) - #55346 (Shrink `Statement`.) - #55358 (Remove redundant clone (2)) - #55370 (Update mailmap for estebank) - #55375 (Typo fixes in configure_cmake comments) - #55378 (rustbuild: use configured linker to build boostrap) - #55379 (validity: assert that unions are non-empty) - #55383 (Use `SmallVec` for the queue in `coerce_unsized`.) - #55391 (bootstrap: clean up a few clippy findings)
Collaborator
|
☔ The latest upstream changes (presumably #55382) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
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
4 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.
Fix #35150.