-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rustdoc: Fix natural ordering to look at all numbers. #75347
Merged
bors
merged 1 commit into
rust-lang:master
from
fusion-engineering-forks:rustdoc-nat-sort
Aug 11, 2020
Merged
Rustdoc: Fix natural ordering to look at all numbers. #75347
bors
merged 1 commit into
rust-lang:master
from
fusion-engineering-forks:rustdoc-nat-sort
Aug 11, 2020
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
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Aug 9, 2020
m-ou-se
force-pushed
the
rustdoc-nat-sort
branch
from
August 9, 2020 19:30
7dcd372
to
02c60ea
Compare
GuillaumeGomez
approved these changes
Aug 9, 2020
I really like this change! What do you think @rust-lang/rustdoc ? |
ollie27
added
the
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
label
Aug 9, 2020
jyn514
approved these changes
Aug 9, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me :)
The old implementation only looks at numbers at the end, but not in other places in a name: "u8" and "u16" got sorted properly, but "u8_bla" and "u16_bla" did not.
m-ou-se
force-pushed
the
rustdoc-nat-sort
branch
from
August 9, 2020 21:05
02c60ea
to
8c705f8
Compare
@bors r=GuillaumeGomez rollup |
📌 Commit 8c705f8 has been approved by |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Aug 10, 2020
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 11, 2020
Rollup of 10 pull requests Successful merges: - rust-lang#74744 (Update RELEASES.md for 1.46.0) - rust-lang#75085 (Transmute big endian `s6_addr` and `[u16; 8]`) - rust-lang#75226 (Miri: Renamed "undef" to "uninit") - rust-lang#75333 (polymorphize: constrain unevaluated const handling) - rust-lang#75338 (move stack size check to const_eval machine) - rust-lang#75347 (Rustdoc: Fix natural ordering to look at all numbers.) - rust-lang#75352 (Tweak conditions for E0026 and E0769) - rust-lang#75353 (Tiny cleanup, remove unnecessary `unwrap`) - rust-lang#75359 (unused_delims: trim expr) - rust-lang#75360 (Add sample fix for E0749) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-rustdoc
Relevant to the rustdoc team, which will review and decide on the PR/issue.
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.
The old implementation only looks at numbers at the end, but not in other places in a name:
u8
andu16
got sorted properly, butu8_bla
andu16_bla
did not.Edit: Also fixes bugs in the old sorting code: