Rename ast::Lit as ast::MetaItemLit.#104804
Merged
bors merged 5 commits intorust-lang:masterfrom Nov 28, 2022
Merged
Conversation
rustbot
added
S-waiting-on-review
Collaborator
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt Some changes occurred in src/librustdoc/clean/types.rs cc @camelid |
nnethercote
force-pushed
the
MetaItemLit
branch
from
bd25c9b to
7760ed0
Compare
This comment has been minimized.
This comment has been minimized.
nnethercote
force-pushed
the
MetaItemLit
branch
from
7760ed0 to
0dfe514
Compare
This comment has been minimized.
This comment has been minimized.
petrochenkov
added
S-waiting-on-author
nnethercote
force-pushed
the
MetaItemLit
branch
2 times, most recently
from
1621cda to
7ad0a66
Compare
Contributor
|
@bors r+ |
Collaborator
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 25, 2022
…enkov Rename `ast::Lit` as `ast::MetaItemLit`. And some other literal cleanups. r? `@petrochenkov`
Member
|
@bors r- failed in a rollup |
bors
added
S-waiting-on-author
Collaborator
|
☔ The latest upstream changes (presumably #104990) made this pull request unmergeable. Please resolve the merge conflicts. |
nnethercote
force-pushed
the
MetaItemLit
branch
from
7ad0a66 to
e01b855
Compare
Contributor
Author
|
I fixed the failure. @bors r=petrochenkov |
Collaborator
|
📌 Commit e01b8552843a768b1fa550237a50416e4b30acf5 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
`Lit::from_included_bytes` calls `Lit::from_lit_kind`, but the two call sites only need the resulting `token::Lit`, not the full `ast::Lit`. This commit changes those call sites to use `LitKind::to_token_lit`, which means `from_included_bytes` can be removed.
We already use a mix of `Literal` and `Lit`. The latter is better because it is shorter without causing any ambiguity.
nnethercote
force-pushed
the
MetaItemLit
branch
from
e01b855 to
a60e337
Compare
Contributor
Author
|
And I fixed the conflict. @bors r=petrochenkov |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 28, 2022
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104804 (Rename `ast::Lit` as `ast::MetaItemLit`.) - rust-lang#104891 (Add documentation for `has_escaping_bound_vars`) - rust-lang#104933 (interpret: remove PartialOrd from a bunch of types that do not have or need a sensible order) - rust-lang#104936 (Ignore bivariant parameters in test_type_match.) - rust-lang#104954 (make simple check of prinf function) - rust-lang#104956 (Avoid ICE if the Clone trait is not found while building error suggestions) - rust-lang#104982 (interpret: get rid of run() function) - rust-lang#104998 (Update my mailmap) - rust-lang#105006 (stricter alignment enforcement for ScalarPair) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Dec 1, 2022
…enkov Rename `ast::Lit` as `ast::MetaItemLit`. And some other literal cleanups. r? `@petrochenkov`
4 tasks
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104804 (Rename `ast::Lit` as `ast::MetaItemLit`.) - rust-lang#104891 (Add documentation for `has_escaping_bound_vars`) - rust-lang#104933 (interpret: remove PartialOrd from a bunch of types that do not have or need a sensible order) - rust-lang#104936 (Ignore bivariant parameters in test_type_match.) - rust-lang#104954 (make simple check of prinf function) - rust-lang#104956 (Avoid ICE if the Clone trait is not found while building error suggestions) - rust-lang#104982 (interpret: get rid of run() function) - rust-lang#104998 (Update my mailmap) - rust-lang#105006 (stricter alignment enforcement for ScalarPair) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
6 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.
And some other literal cleanups.
r? @petrochenkov