Reapply "Initial work on formatting headers" #6457
Open
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
This reverts commit f2c84b5.
ytmimi
reviewed
Jan 30, 2025
Comment on lines
+63
to
+68
| #[derive(Debug)] | ||
| pub(crate) struct HeaderPart { | ||
| /// snippet of this part without surrounding space | ||
| snippet: Cow<'static, str>, | ||
| span: Span, | ||
| } |
There was a problem hiding this comment.
Does the snippet need to be a Cow<'static, str>? Could we make it a Cow<'a, str> or are there lifetime issues that prevent that?
ytmimi
reviewed
Jan 30, 2025
Comment on lines
+79
to
+82
| Self { | ||
| snippet: rewrite_ident(context, ident).to_owned().into(), | ||
| span: ident.span, | ||
| } |
There was a problem hiding this comment.
Should this be implemented in terms of HeaderPart::new? Would save you needing to call .into().
Suggested change
| Self { | |
| snippet: rewrite_ident(context, ident).to_owned().into(), | |
| span: ident.span, | |
| } | |
| let snippet = rewrite_ident(context, ident).to_owned(); | |
| Self::new(snippet, ident.span) |
If we can make HeaderPart hold a Cow<'a, str>, then this could probably be written as:
Self::new(rewrite_ident(context, ident), ident.span)
ytmimi
reviewed
Jan 30, 2025
| let path = segments_iter.collect::<Vec<_>>().join("::"); | ||
| let in_str = if is_keyword(&path) { "" } else { "in " }; | ||
|
|
||
| Cow::from(format!("pub({}{})", in_str, path)) |
There was a problem hiding this comment.
Not something that we need to fix right now, but we're potentially missing comments within the visibility modifier. e.g pub( /* comment */ crate /* comment */).
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.
As per this comment.
This reimplements the header formatting infrastructure to resume porting to this system, if there are comments between header parts, we preserve the original whitespace/comments snippet instead of realigning/reformatting them.
This reverts commit f2c84b5.