rustdoc: improve <wbr>-insertion for SCREAMING_CAMEL_CASE
#131370
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
|
rustbot has assigned @GuillaumeGomez. Use |
rustbot
added
S-waiting-on-review
notriddle
commented
Oct 7, 2024
src/librustdoc/html/escape/tests.rs
Outdated
| @@ -24,6 +24,7 @@ fn escape_body_text_with_wbr() { | |||
| assert_eq!(&E("first:second").to_string(), "first:<wbr>second"); | |||
| assert_eq!(&E("first::second").to_string(), "first::<wbr>second"); | |||
| assert_eq!(&E("MY_CONSTANT").to_string(), "MY_<wbr>CONSTANT"); | |||
| assert_eq!(&E("_SIDD_MASKED_NEGATIVE_POLARITY").to_string(), "_SIDD_<wbr>MASKED_<wbr>NEGATIVE_<wbr>POLARITY"); | |||
There was a problem hiding this comment.
This sample is pulled from core/arch, and before this patch it was written _SID<wbr>D_<wbr>MASKE<wbr>D_<wbr>NEGATIV<wbr>E_<wbr>POLARITY which is clearly worse.
This comment has been minimized.
This comment has been minimized.
notriddle
force-pushed
the
notriddle/screaming-camel-case
branch
from
24cbbf9 to
e23419f
Compare
| @@ -108,7 +108,7 @@ impl<'a> fmt::Display for EscapeBodyTextWithWbr<'a> { | |||
| || pk.map_or(true, |(_, t)| t.chars().any(|c| c.is_uppercase())); | |||
| let next_is_underscore = || pk.map_or(true, |(_, t)| t.contains('_')); | |||
| let next_is_colon = || pk.map_or(true, |(_, t)| t.contains(':')); | |||
| if i - last > 3 && is_uppercase() && !next_is_uppercase() { | |||
| if i - last > 3 && is_uppercase() && !next_is_uppercase() && !next_is_underscore() { | |||
There was a problem hiding this comment.
I think this code is now complex enough to deserve a small comment (at least on this if) to explain what it's checking (with some examples to make it even simpler).
GuillaumeGomez
approved these changes
Oct 7, 2024
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Oct 7, 2024
…l-case, r=GuillaumeGomez rustdoc: improve `<wbr>`-insertion for SCREAMING_CAMEL_CASE
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 7, 2024
…llaumeGomez Rollup of 4 pull requests Successful merges: - rust-lang#130824 (Add missing module flags for `-Zfunction-return=thunk-extern`) - rust-lang#131170 (Fix `target_vendor` in non-IDF Xtensa ESP32 targets) - rust-lang#131369 (Update books) - rust-lang#131370 (rustdoc: improve `<wbr>`-insertion for SCREAMING_CAMEL_CASE) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 8, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#130824 (Add missing module flags for `-Zfunction-return=thunk-extern`) - rust-lang#131170 (Fix `target_vendor` in non-IDF Xtensa ESP32 targets) - rust-lang#131355 (Add tests for some old fixed issues) - rust-lang#131369 (Update books) - rust-lang#131370 (rustdoc: improve `<wbr>`-insertion for SCREAMING_CAMEL_CASE) - rust-lang#131379 (Fix utf8-bom test) - rust-lang#131385 (Un-vacation myself) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 8, 2024
Rollup merge of rust-lang#131370 - notriddle:notriddle/screaming-camel-case, r=GuillaumeGomez rustdoc: improve `<wbr>`-insertion for SCREAMING_CAMEL_CASE
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.
No description provided.