Uh oh!
There was an error while loading. Please reload this page.
rustc_expand: Factor out Annotatable::into_tokens to a separate method - #69680
Merged
Conversation
Centril
commented
Mar 3, 2020
Contributor
@bors r+ |
bors
commented
Mar 3, 2020
Collaborator
📌 Commit 33f8e462fd4c6072f5898a7681449512990bdda8 has been approved by |
bors
commented
Mar 6, 2020
Collaborator
☔ The latest upstream changes (presumably #69586) made this pull request unmergeable. Please resolve the merge conflicts. |
bors added a commit
that referenced
this pull request
Mar 6, 2020
Rollup of 6 pull requests Successful merges: - #69656 (Use .next() instead of .nth(0) on iterators.) - #69674 (Rename DefKind::Method and TraitItemKind::Method ) - #69676 (Pass correct place to `discriminant_switch_effect`) - #69706 (Use subslice patterns in slice methods) - #69714 (Make PlaceRef take just one lifetime) - #69727 (Avoid using `unwrap()` in suggestions) Failed merges: - #69589 (ast: `Mac`/`Macro` -> `MacCall`) - #69680 (rustc_expand: Factor out `Annotatable::into_tokens` to a separate method) r? @ghost
petrochenkov
commented
Mar 6, 2020
ContributorAuthor
@bors r=Centril |
bors
commented
Mar 6, 2020
Collaborator
📌 Commit 2d0c5b4 has been approved by |
Centril added a commit
to Centril/rust
that referenced
this pull request
Mar 7, 2020
rustc_expand: Factor out `Annotatable::into_tokens` to a separate method Minor refactoring salvaged from rust-lang#69594. r? @Centril
bors added a commit
that referenced
this pull request
Mar 7, 2020
Rollup of 9 pull requests Successful merges: - #67741 (When encountering an Item in a pat context, point at the item def) - #68985 (Parse & reject postfix operators after casts) - #69656 (Use .next() instead of .nth(0) on iterators.) - #69680 (rustc_expand: Factor out `Annotatable::into_tokens` to a separate method) - #69690 (test(pattern): add tests for combinations of pattern features) - #69706 (Use subslice patterns in slice methods) - #69727 (Avoid using `unwrap()` in suggestions) - #69754 (Update deprecation version to 1.42 for Error::description) - #69782 (Don't redundantly repeat field names (clippy::redundant_field_names)) Failed merges: r? @ghost
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 freeto 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.
Minor refactoring salvaged from #69594.
r? @Centril