Copy an example to PartialOrd as well #92953
Merged
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
|
r? @dtolnay (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
dtolnay
requested changes
Jan 16, 2022
There was a problem hiding this comment.
This says two contradictory things. The first sentence says it's based on discriminant order, and the second sentence says it's based on source order.
When those two are not the same thing, I feel like it's the job of exactly this documentation you're touching to make it clear what the behavior of the derived impl is.
#[derive(PartialEq, Eq, PartialOrd, Ord)]
enum N {
Two = 2,
One = 1,
}
|
That's a great point. I think we could improve the part about "top-to-bottom discriminant order". |
|
@bors r+ rollup |
|
📌 Commit bfe0a4e has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 17, 2022
…askrgr Rollup of 10 pull requests Successful merges: - rust-lang#92795 (Link sidebar "location" heading to top of page) - rust-lang#92799 (Remove some unnecessary uses of `FieldDef::ident`) - rust-lang#92808 (Fix `try wrapping expression in variant` suggestion with struct field shorthand) - rust-lang#92819 (rustdoc: remove hand-rolled isatty) - rust-lang#92876 (Fix suggesting turbofish with lifetime arguments) - rust-lang#92921 (Rename Printer constructor from mk_printer() to Printer::new()) - rust-lang#92937 (rustdoc: Add missing dot separator) - rust-lang#92953 (Copy an example to PartialOrd as well) - rust-lang#92977 (Docs: recommend VecDeque instead of Vec::remove(0)) - rust-lang#92981 (fix const_ptr_offset_from tracking issue) 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
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.
In #88202 I added an example for deriving PartialOrd on enums, but only later did I realize that I actually put the example on Ord.
This copies the example to PartialOrd as well, which is where I intended for it to be.
We could also delete the example on Ord, but I see there's already some highly similar examples shared between Ord and PartialOrd, so I figured we could leave it.
I also changed some type annotations in an example from
x : Tto the more common style (in Rust) ofx: T.