Skip to content

Commit f540548

Browse files
committed
cmp doc examples consistency improvements
1 parent bdb32bd commit f540548

File tree

1 file changed

+46
-45
lines changed

1 file changed

+46
-45
lines changed

library/core/src/cmp.rs

+46-45
Original file line numberDiff line numberDiff line change
@@ -324,14 +324,11 @@ pub struct AssertParamIsEq<T: Eq + ?Sized> {
324324
/// ```
325325
/// use std::cmp::Ordering;
326326
///
327-
/// let result = 1.cmp(&2);
328-
/// assert_eq!(Ordering::Less, result);
327+
/// assert_eq!(1.cmp(&2), Ordering::Less);
329328
///
330-
/// let result = 1.cmp(&1);
331-
/// assert_eq!(Ordering::Equal, result);
329+
/// assert_eq!(1.cmp(&1), Ordering::Equal);
332330
///
333-
/// let result = 2.cmp(&1);
334-
/// assert_eq!(Ordering::Greater, result);
331+
/// assert_eq!(2.cmp(&1), Ordering::Greater);
335332
/// ```
336333
#[derive(Clone, Copy, Eq, Debug, Hash)]
337334
#[derive_const(PartialOrd, Ord, PartialEq)]
@@ -790,8 +787,8 @@ pub trait Ord: Eq + PartialOrd<Self> {
790787
/// # Examples
791788
///
792789
/// ```
793-
/// assert_eq!(2, 1.max(2));
794-
/// assert_eq!(2, 2.max(2));
790+
/// assert_eq!(1.max(2), 2);
791+
/// assert_eq!(2.max(2), 2);
795792
/// ```
796793
#[stable(feature = "ord_max_min", since = "1.21.0")]
797794
#[inline]
@@ -811,8 +808,8 @@ pub trait Ord: Eq + PartialOrd<Self> {
811808
/// # Examples
812809
///
813810
/// ```
814-
/// assert_eq!(1, 1.min(2));
815-
/// assert_eq!(2, 2.min(2));
811+
/// assert_eq!(1.min(2), 1);
812+
/// assert_eq!(2.min(2), 2);
816813
/// ```
817814
#[stable(feature = "ord_max_min", since = "1.21.0")]
818815
#[inline]
@@ -837,9 +834,9 @@ pub trait Ord: Eq + PartialOrd<Self> {
837834
/// # Examples
838835
///
839836
/// ```
840-
/// assert!((-3).clamp(-2, 1) == -2);
841-
/// assert!(0.clamp(-2, 1) == 0);
842-
/// assert!(2.clamp(-2, 1) == 1);
837+
/// assert_eq!((-3).clamp(-2, 1), -2);
838+
/// assert_eq!(0.clamp(-2, 1), 0);
839+
/// assert_eq!(2.clamp(-2, 1), 1);
843840
/// ```
844841
#[must_use]
845842
#[stable(feature = "clamp", since = "1.50.0")]
@@ -1070,11 +1067,9 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
10701067
/// # Examples
10711068
///
10721069
/// ```
1073-
/// let result = 1.0 < 2.0;
1074-
/// assert_eq!(result, true);
1075-
///
1076-
/// let result = 2.0 < 1.0;
1077-
/// assert_eq!(result, false);
1070+
/// assert_eq!(1.0 < 1.0, false);
1071+
/// assert_eq!(1.0 < 2.0, true);
1072+
/// assert_eq!(2.0 < 1.0, false);
10781073
/// ```
10791074
#[inline]
10801075
#[must_use]
@@ -1089,11 +1084,9 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
10891084
/// # Examples
10901085
///
10911086
/// ```
1092-
/// let result = 1.0 <= 2.0;
1093-
/// assert_eq!(result, true);
1094-
///
1095-
/// let result = 2.0 <= 2.0;
1096-
/// assert_eq!(result, true);
1087+
/// assert_eq!(1.0 <= 1.0, true);
1088+
/// assert_eq!(1.0 <= 2.0, true);
1089+
/// assert_eq!(2.0 <= 1.0, false);
10971090
/// ```
10981091
#[inline]
10991092
#[must_use]
@@ -1107,11 +1100,9 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
11071100
/// # Examples
11081101
///
11091102
/// ```
1110-
/// let result = 1.0 > 2.0;
1111-
/// assert_eq!(result, false);
1112-
///
1113-
/// let result = 2.0 > 2.0;
1114-
/// assert_eq!(result, false);
1103+
/// assert_eq!(1.0 > 1.0, false);
1104+
/// assert_eq!(1.0 > 2.0, false);
1105+
/// assert_eq!(2.0 > 1.0, true);
11151106
/// ```
11161107
#[inline]
11171108
#[must_use]
@@ -1126,11 +1117,9 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
11261117
/// # Examples
11271118
///
11281119
/// ```
1129-
/// let result = 2.0 >= 1.0;
1130-
/// assert_eq!(result, true);
1131-
///
1132-
/// let result = 2.0 >= 2.0;
1133-
/// assert_eq!(result, true);
1120+
/// assert_eq!(1.0 >= 1.0, true);
1121+
/// assert_eq!(1.0 >= 2.0, false);
1122+
/// assert_eq!(2.0 >= 1.0, true);
11341123
/// ```
11351124
#[inline]
11361125
#[must_use]
@@ -1160,8 +1149,8 @@ pub macro PartialOrd($item:item) {
11601149
/// ```
11611150
/// use std::cmp;
11621151
///
1163-
/// assert_eq!(1, cmp::min(1, 2));
1164-
/// assert_eq!(2, cmp::min(2, 2));
1152+
/// assert_eq!(cmp::min(1, 2), 1);
1153+
/// assert_eq!(cmp::min(2, 2), 2);
11651154
/// ```
11661155
#[inline]
11671156
#[must_use]
@@ -1181,8 +1170,11 @@ pub const fn min<T: ~const Ord + ~const Destruct>(v1: T, v2: T) -> T {
11811170
/// ```
11821171
/// use std::cmp;
11831172
///
1184-
/// assert_eq!(cmp::min_by(-2, 1, |x: &i32, y: &i32| x.abs().cmp(&y.abs())), 1);
1185-
/// assert_eq!(cmp::min_by(-2, 2, |x: &i32, y: &i32| x.abs().cmp(&y.abs())), -2);
1173+
/// let result = cmp::min_by(-2, 1, |x: &i32, y: &i32| x.abs().cmp(&y.abs()));
1174+
/// assert_eq!(result, 1);
1175+
///
1176+
/// let result = cmp::min_by(-2, 3, |x: &i32, y: &i32| x.abs().cmp(&y.abs()));
1177+
/// assert_eq!(result, -2);
11861178
/// ```
11871179
#[inline]
11881180
#[must_use]
@@ -1208,8 +1200,11 @@ where
12081200
/// ```
12091201
/// use std::cmp;
12101202
///
1211-
/// assert_eq!(cmp::min_by_key(-2, 1, |x: &i32| x.abs()), 1);
1212-
/// assert_eq!(cmp::min_by_key(-2, 2, |x: &i32| x.abs()), -2);
1203+
/// let result = cmp::min_by_key(-2, 1, |x: &i32| x.abs());
1204+
/// assert_eq!(result, 1);
1205+
///
1206+
/// let result = cmp::min_by_key(-2, 2, |x: &i32| x.abs());
1207+
/// assert_eq!(result, -2);
12131208
/// ```
12141209
#[inline]
12151210
#[must_use]
@@ -1235,8 +1230,8 @@ where
12351230
/// ```
12361231
/// use std::cmp;
12371232
///
1238-
/// assert_eq!(2, cmp::max(1, 2));
1239-
/// assert_eq!(2, cmp::max(2, 2));
1233+
/// assert_eq!(cmp::max(1, 2), 2);
1234+
/// assert_eq!(cmp::max(2, 2), 2);
12401235
/// ```
12411236
#[inline]
12421237
#[must_use]
@@ -1256,8 +1251,11 @@ pub const fn max<T: ~const Ord + ~const Destruct>(v1: T, v2: T) -> T {
12561251
/// ```
12571252
/// use std::cmp;
12581253
///
1259-
/// assert_eq!(cmp::max_by(-2, 1, |x: &i32, y: &i32| x.abs().cmp(&y.abs())), -2);
1260-
/// assert_eq!(cmp::max_by(-2, 2, |x: &i32, y: &i32| x.abs().cmp(&y.abs())), 2);
1254+
/// let result = cmp::max_by(-2, 1, |x: &i32, y: &i32| x.abs().cmp(&y.abs()));
1255+
/// assert_eq!(result, -2);
1256+
///
1257+
/// let result = cmp::max_by(-2, 2, |x: &i32, y: &i32| x.abs().cmp(&y.abs())) ;
1258+
/// assert_eq!(result, 2);
12611259
/// ```
12621260
#[inline]
12631261
#[must_use]
@@ -1283,8 +1281,11 @@ where
12831281
/// ```
12841282
/// use std::cmp;
12851283
///
1286-
/// assert_eq!(cmp::max_by_key(-2, 1, |x: &i32| x.abs()), -2);
1287-
/// assert_eq!(cmp::max_by_key(-2, 2, |x: &i32| x.abs()), 2);
1284+
/// let result = cmp::max_by_key(-2, 1, |x: &i32| x.abs());
1285+
/// assert_eq!(result, -2);
1286+
///
1287+
/// let result = cmp::max_by_key(-2, 2, |x: &i32| x.abs());
1288+
/// assert_eq!(result, 2);
12881289
/// ```
12891290
#[inline]
12901291
#[must_use]

0 commit comments

Comments
 (0)