Use span of placeholders in format_args!() expansion. #109664
Merged
Conversation
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
(Only the lifetime spans changed.)
m-ou-se added A-diagnostics 
| r? @TaKO8Ki (rustbot has picked a reviewer for you, use r? to override) |
rustbot added the S-waiting-on-review 
| r? @oli-obk |
| @bors r+ |
bors added S-waiting-on-bors 
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2023
Rollup of 7 pull requests Successful merges: - rust-lang#108335 (rustdoc + rustdoc-json support for `feature(non_lifetime_binders)`) - rust-lang#109534 (rustdoc: Unsupport importing `doc(primitive)` and `doc(keyword)` modules) - rust-lang#109659 (llvm-wrapper: adapt for LLVM API change) - rust-lang#109664 (Use span of placeholders in format_args!() expansion.) - rust-lang#109683 (Check for overflow in `assemble_candidates_after_normalizing_self_ty`) - rust-lang#109713 (Fix mismatched punctuation in Debug impl of AttrId) - rust-lang#109718 (Rename `IndexVec::last` → `last_index`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 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.
format_args!("{}", x)expands to something that containsArgument::new_display(&x). That entire expression was generated with the span ofx.After this PR,
&xuses the span ofx, but thenew_displaycall uses the span of the{}placeholder within the format string. If an implicitly captured argument was used like informat_args!("{x}"), both use the span of the{x}placeholder.This fixes #109576, and also allows for more improvements to similar diagnostics in the future, since the usage of
xcan now be traced to the exact{}placeholder that required it to beDisplay(orDebugetc.)