cleanup: Remove Spanned where possible
#63586
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
petrochenkov
added
the
S-waiting-on-review
eddyb
reviewed
Aug 15, 2019
| /// Represents a macro invocation. The `Path` indicates which macro | ||
| /// is being invoked, and the vector of token-trees contains the source | ||
| /// of the macro invocation. | ||
| /// | ||
| /// N.B., the additional ident for a `macro_rules`-style macro is actually | ||
| /// stored in the enclosing item. | ||
| #[derive(Clone, RustcEncodable, RustcDecodable, Debug)] | ||
| pub struct Mac_ { | ||
| pub struct Mac { |
There was a problem hiding this comment.
By this point we can probably rename this to MacroInvocation or MacroCall.
(but it doesn't need to be in this PR)
eddyb
approved these changes
Aug 15, 2019
|
@bors r+ |
|
📌 Commit 3fed181b5326ad50695c72663c65ab9ff10e6af6 has been approved by |
bors
added
S-waiting-on-bors
|
Nice change. ...But the PR builder seems unhappy? @bors r- |
bors
added
S-waiting-on-author
petrochenkov
force-pushed
the
nospanned
branch
from
3fed181
to
a618271
Compare
|
@bors r=eddyb |
|
📌 Commit a618271 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 15, 2019
cleanup: Remove `Spanned` where possible It generally only makes sense on enums, otherwise it's more convenient to "flatten" it by adding a span field to the struct it wraps.
Centril
added a commit
to Centril/rust
that referenced
this pull request
Aug 15, 2019
cleanup: Remove `Spanned` where possible It generally only makes sense on enums, otherwise it's more convenient to "flatten" it by adding a span field to the struct it wraps.
bors
added a commit
that referenced
this pull request
Aug 15, 2019
Rollup of 9 pull requests Successful merges: - #63155 (Add UWP MSVC targets) - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64) - #63306 (Adapt AddRetag for shallow retagging) - #63467 (Add Catalyst (iOS apps running on macOS) target) - #63546 (Remove uses of `mem::uninitialized()` from cloudabi) - #63572 (remove unused Level::PhaseFatal) - #63577 (Test HRTB issue accepted by compiler) - #63582 (Fix ICE #63226) - #63586 (cleanup: Remove `Spanned` where possible) Failed merges: r? @ghost
|
☔ The latest upstream changes (presumably #63592) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
bors
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Aug 16, 2019
Rustup "Remove `Spanned` from `{ast,hir}::FieldPat`"
Rustup rust-lang/rust#63586
changelog: none
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Mar 5, 2020
ast: `Mac`/`Macro` -> `MacCall` It's now obvious that these refer to macro calls rather than to macro definitions. It's also a single name instead of two different names in different places. `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls. cc rust-lang#63586 (comment) r? @eddyb
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 7, 2020
ast: `Mac`/`Macro` -> `MacCall` It's now obvious that these refer to macro calls rather than to macro definitions. It's also a single name instead of two different names in different places. `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls. cc rust-lang#63586 (comment) r? @eddyb
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Mar 14, 2020
ast: `Mac`/`Macro` -> `MacCall` It's now obvious that these refer to macro calls rather than to macro definitions. It's also a single name instead of two different names in different places. `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls. cc rust-lang#63586 (comment) r? @eddyb
Centril
added a commit
to Centril/rust
that referenced
this pull request
Mar 15, 2020
ast: `Mac`/`Macro` -> `MacCall` It's now obvious that these refer to macro calls rather than to macro definitions. It's also a single name instead of two different names in different places. `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls. cc rust-lang#63586 (comment) r? @eddyb
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.
It generally only makes sense on enums, otherwise it's more convenient to "flatten" it by adding a span field to the struct it wraps.