Uh oh!
There was an error while loading. Please reload this page.
format macro argument parsing fix - #83348
Merged
Merged
Conversation
jackh726
commented
Mar 26, 2021
Member
bors
commented
Mar 26, 2021
Collaborator
📌 Commit 6c45ebe has been approved by |
Dylan-DPC-zz pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 26, 2021
format macro argument parsing fix
When the character next to `{}` is "shifted" (when mapping a byte index
in the format string to span) we should avoid shifting the span end
index, so first map the index of `}` to span, then bump the span,
instead of first mapping the next byte index to a span (which causes
bumping the end span too much).
Regression test added.
Fixesrust-lang#83344
---
r? `@estebank`JohnTitor added a commit
to JohnTitor/rust
that referenced
this pull request
Mar 27, 2021
format macro argument parsing fix
When the character next to `{}` is "shifted" (when mapping a byte index
in the format string to span) we should avoid shifting the span end
index, so first map the index of `}` to span, then bump the span,
instead of first mapping the next byte index to a span (which causes
bumping the end span too much).
Regression test added.
Fixesrust-lang#83344
---
r? ``@estebank``JohnTitor
commented
Mar 27, 2021
Member
Failed in rollup: #83545 (comment) |
klensy
reviewed
Mar 27, 2021
Uh oh!
There was an error while loading. Please reload this page.
osa1
commented
Mar 27, 2021
ContributorAuthor
This passes the tests locally, and on CI. I don't understand why it failed in the batch merge PR. Any tips? |
JohnTitor
commented
Mar 27, 2021
Member
@osa1 The auto merge CI run clippy tests but PR's doesn't. You can reproduce the test failure with |
When the character next to `{}` is "shifted" (when mapping a byte index
in the format string to span) we should avoid shifting the span end
index, so first map the index of `}` to span, then bump the span,
instead of first mapping the next byte index to a span (which causes
bumping the end span too much).
Regression test added.
Fixes#83344osa1
commented
Mar 27, 2021
ContributorAuthor
Thanks @JohnTitor . I updated a clippy test output, we can try this again now. |
JohnTitor
commented
Mar 27, 2021
Member
Thanks for the update, too! @bors r=jackh726 |
bors
commented
Mar 27, 2021
Collaborator
📌 Commit 5b9bac2 has been approved by |
Dylan-DPC-zz pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 27, 2021
format macro argument parsing fix
When the character next to `{}` is "shifted" (when mapping a byte index
in the format string to span) we should avoid shifting the span end
index, so first map the index of `}` to span, then bump the span,
instead of first mapping the next byte index to a span (which causes
bumping the end span too much).
Regression test added.
Fixesrust-lang#83344
---
r? `@estebank`Dylan-DPC-zz pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Mar 27, 2021
format macro argument parsing fix
When the character next to `{}` is "shifted" (when mapping a byte index
in the format string to span) we should avoid shifting the span end
index, so first map the index of `}` to span, then bump the span,
instead of first mapping the next byte index to a span (which causes
bumping the end span too much).
Regression test added.
Fixesrust-lang#83344
---
r? ``@estebank``bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2021
Rollup of 10 pull requests Successful merges: - rust-lang#79399 (Use detailed and shorter fs error explaination) - rust-lang#83348 (format macro argument parsing fix) - rust-lang#83462 (ExitStatus: print "exit status: {}" rather than "exit code: {}" on unix) - rust-lang#83526 (lazily calls some fns) - rust-lang#83558 (Use DebugStruct::finish_non_exhaustive() in std.) - rust-lang#83559 (Fix Debug implementation for RwLock{Read,Write}Guard.) - rust-lang#83560 (Derive Debug for io::Chain instead of manually implementing it.) - rust-lang#83561 (Improve Debug implementations of Mutex and RwLock.) - rust-lang#83567 (Update rustup cross-compilation docs link) - rust-lang#83569 (Add regression tests for rust-lang#56445) 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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.
When the character next to
{}is "shifted" (when mapping a byte indexin the format string to span) we should avoid shifting the span end
index, so first map the index of
}to span, then bump the span,instead of first mapping the next byte index to a span (which causes
bumping the end span too much).
Regression test added.
Fixes#83344
r? @estebank