diff options
| author | bors <bors@rust-lang.org> | 2015-06-02 08:28:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-02 08:28:20 +0000 |
| commit | 48e9ef640480a5371759d011da7acbe2fa182511 (patch) | |
| tree | 8655cf3be1ed8201ea85a47b0069cb3cb07f6474 /src/libstd | |
| parent | f14190199cdbcd508e0ac28e8c62c61dea404230 (diff) | |
| parent | 6e97b16d0277d86fb06a158683ef3c15ece14a62 (diff) | |
| download | rust-48e9ef640480a5371759d011da7acbe2fa182511.tar.gz rust-48e9ef640480a5371759d011da7acbe2fa182511.zip | |
Auto merge of #25958 - Manishearth:rollup, r=Manishearth
- Successful merges: #25751, #25821, #25920, #25932, #25933, #25936, #25941, #25949, #25951 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/num/f32.rs | 4 | ||||
| -rw-r--r-- | src/libstd/num/f64.rs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index e31d97b3240..c22f5d073de 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -660,6 +660,8 @@ impl f32 { /// /// assert_eq!(x.max(y), y); /// ``` + /// + /// If one of the arguments is NaN, then the other argument is returned. #[stable(feature = "rust1", since = "1.0.0")] #[inline] pub fn max(self, other: f32) -> f32 { @@ -674,6 +676,8 @@ impl f32 { /// /// assert_eq!(x.min(y), x); /// ``` + /// + /// If one of the arguments is NaN, then the other argument is returned. #[stable(feature = "rust1", since = "1.0.0")] #[inline] pub fn min(self, other: f32) -> f32 { diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index e87855ffd4e..cde0b567ade 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -636,6 +636,8 @@ impl f64 { /// /// assert_eq!(x.max(y), y); /// ``` + /// + /// If one of the arguments is NaN, then the other argument is returned. #[stable(feature = "rust1", since = "1.0.0")] #[inline] pub fn max(self, other: f64) -> f64 { @@ -650,6 +652,8 @@ impl f64 { /// /// assert_eq!(x.min(y), x); /// ``` + /// + /// If one of the arguments is NaN, then the other argument is returned. #[stable(feature = "rust1", since = "1.0.0")] #[inline] pub fn min(self, other: f64) -> f64 { |