Skip to content

Commit f62dce9

Browse files
committed
---
yaml --- r: 274689 b: refs/heads/stable c: 096dbf8 h: refs/heads/master i: 274687: fe0a373
1 parent 49f3e4f commit f62dce9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: 4b067183baca48c0705c20d9d9570607b99f81a9
32+
refs/heads/stable: 096dbf84c7acc78283adfa46eecd41d7355f6f3e
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libcore/cmp.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,8 @@ impl Ordering {
165165
/// - total and antisymmetric: exactly one of `a < b`, `a == b` or `a > b` is true; and
166166
/// - transitive, `a < b` and `b < c` implies `a < c`. The same must hold for both `==` and `>`.
167167
///
168-
/// When this trait is `derive`d, it produces a lexicographic ordering.
169-
///
170-
/// This trait can be used with `#[derive]`.
168+
/// This trait can be used with `#[derive]`. When `derive`d, it will produce a lexicographic
169+
/// ordering based on the top-to-bottom declaration order of the struct's members.
171170
#[stable(feature = "rust1", since = "1.0.0")]
172171
pub trait Ord: Eq + PartialOrd<Self> {
173172
/// This method returns an `Ordering` between `self` and `other`.
@@ -225,7 +224,8 @@ impl PartialOrd for Ordering {
225224
/// total order. For example, for floating point numbers, `NaN < 0 == false` and `NaN >= 0 ==
226225
/// false` (cf. IEEE 754-2008 section 5.11).
227226
///
228-
/// This trait can be used with `#[derive]`.
227+
/// This trait can be used with `#[derive]`. When `derive`d, it will produce an ordering
228+
/// based on the top-to-bottom declaration order of the struct's members.
229229
#[lang = "ord"]
230230
#[stable(feature = "rust1", since = "1.0.0")]
231231
pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {

0 commit comments

Comments
 (0)