Skip to content

Commit 5d8e494

Browse files
committed
auto merge of #9585 : vky/rust/num-docs, r=alexcrichton
Copied existing comments from other files, and added comments to functions that did not have existing comments available. cc #7511
2 parents 1f279bf + 5e1ccc6 commit 5d8e494

File tree

1 file changed

+70
-2
lines changed

1 file changed

+70
-2
lines changed

src/libstd/num/num.rs

+70-2
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,26 @@ pub trait Orderable: Ord {
4242
fn clamp(&self, mn: &Self, mx: &Self) -> Self;
4343
}
4444

45+
/// Return the smaller number.
4546
#[inline(always)] pub fn min<T: Orderable>(x: T, y: T) -> T { x.min(&y) }
47+
/// Return the larger number.
4648
#[inline(always)] pub fn max<T: Orderable>(x: T, y: T) -> T { x.max(&y) }
49+
/// Returns the number constrained within the range `mn <= self <= mx`.
4750
#[inline(always)] pub fn clamp<T: Orderable>(value: T, mn: T, mx: T) -> T { value.clamp(&mn, &mx) }
4851

4952
pub trait Zero {
5053
fn zero() -> Self; // FIXME (#5527): This should be an associated constant
5154
fn is_zero(&self) -> bool;
5255
}
5356

57+
/// Returns `0` of appropriate type.
5458
#[inline(always)] pub fn zero<T: Zero>() -> T { Zero::zero() }
5559

5660
pub trait One {
5761
fn one() -> Self; // FIXME (#5527): This should be an associated constant
5862
}
5963

64+
/// Returns `1` of appropriate type.
6065
#[inline(always)] pub fn one<T: One>() -> T { One::one() }
6166

6267
pub trait Signed: Num
@@ -69,8 +74,26 @@ pub trait Signed: Num
6974
fn is_negative(&self) -> bool;
7075
}
7176

77+
/// Computes the absolute value.
78+
///
79+
/// For float, f32, and f64, `NaN` will be returned if the number is `NaN`
7280
#[inline(always)] pub fn abs<T: Signed>(value: T) -> T { value.abs() }
81+
/// The positive difference of two numbers.
82+
///
83+
/// Returns `zero` if the number is less than or equal to `other`,
84+
/// otherwise the difference between `self` and `other` is returned.
7385
#[inline(always)] pub fn abs_sub<T: Signed>(x: T, y: T) -> T { x.abs_sub(&y) }
86+
/// Returns the sign of the number.
87+
///
88+
/// For float, f32, f64:
89+
/// - `1.0` if the number is positive, `+0.0` or `infinity`
90+
/// - `-1.0` if the number is negative, `-0.0` or `neg_infinity`
91+
/// - `NaN` if the number is `NaN`
92+
///
93+
/// For int:
94+
/// - `0` if the number is zero
95+
/// - `1` if the number is positive
96+
/// - `-1` if the number is negative
7497
#[inline(always)] pub fn signum<T: Signed>(value: T) -> T { value.signum() }
7598

7699
pub trait Unsigned: Num {}
@@ -106,7 +129,11 @@ pub trait Integer: Num
106129
fn is_odd(&self) -> bool;
107130
}
108131

132+
/// Calculates the Greatest Common Divisor (GCD) of the number and `other`.
133+
///
134+
/// The result is always positive.
109135
#[inline(always)] pub fn gcd<T: Integer>(x: T, y: T) -> T { x.gcd(&y) }
136+
/// Calculates the Lowest Common Multiple (LCM) of the number and `other`.
110137
#[inline(always)] pub fn lcm<T: Integer>(x: T, y: T) -> T { x.lcm(&y) }
111138

112139
pub trait Round {
@@ -132,10 +159,23 @@ pub trait Algebraic {
132159
fn hypot(&self, other: &Self) -> Self;
133160
}
134161

162+
/// Raise a number to a power.
163+
///
164+
/// # Example
165+
///
166+
/// ```rust
167+
/// let sixteen: float = num::pow(2.0, 4.0);
168+
/// assert_eq!(sixteen, 16.0);
169+
/// ```
135170
#[inline(always)] pub fn pow<T: Algebraic>(value: T, n: T) -> T { value.pow(&n) }
171+
/// Take the squre root of a number.
136172
#[inline(always)] pub fn sqrt<T: Algebraic>(value: T) -> T { value.sqrt() }
173+
/// Take the reciprocal (inverse) square root of a number, `1/sqrt(x)`.
137174
#[inline(always)] pub fn rsqrt<T: Algebraic>(value: T) -> T { value.rsqrt() }
175+
/// Take the cubic root of a number.
138176
#[inline(always)] pub fn cbrt<T: Algebraic>(value: T) -> T { value.cbrt() }
177+
/// Calculate the length of the hypotenuse of a right-angle triangle given legs of length `x` and
178+
/// `y`.
139179
#[inline(always)] pub fn hypot<T: Algebraic>(x: T, y: T) -> T { x.hypot(&y) }
140180

141181
pub trait Trigonometric {
@@ -151,15 +191,23 @@ pub trait Trigonometric {
151191
fn sin_cos(&self) -> (Self, Self);
152192
}
153193

194+
/// Sine function.
154195
#[inline(always)] pub fn sin<T: Trigonometric>(value: T) -> T { value.sin() }
196+
/// Cosine function.
155197
#[inline(always)] pub fn cos<T: Trigonometric>(value: T) -> T { value.cos() }
198+
/// Tangent function.
156199
#[inline(always)] pub fn tan<T: Trigonometric>(value: T) -> T { value.tan() }
157200

201+
/// Compute the arcsine of the number.
158202
#[inline(always)] pub fn asin<T: Trigonometric>(value: T) -> T { value.asin() }
203+
/// Compute the arccosine of the number.
159204
#[inline(always)] pub fn acos<T: Trigonometric>(value: T) -> T { value.acos() }
205+
/// Compute the arctangent of the number.
160206
#[inline(always)] pub fn atan<T: Trigonometric>(value: T) -> T { value.atan() }
161207

208+
/// Compute the arctangent with 2 arguments.
162209
#[inline(always)] pub fn atan2<T: Trigonometric>(x: T, y: T) -> T { x.atan2(&y) }
210+
/// Simultaneously computes the sine and cosine of the number.
163211
#[inline(always)] pub fn sin_cos<T: Trigonometric>(value: T) -> (T, T) { value.sin_cos() }
164212

165213
pub trait Exponential {
@@ -172,12 +220,18 @@ pub trait Exponential {
172220
fn log10(&self) -> Self;
173221
}
174222

223+
/// Returns `e^(value)`, (the exponential function).
175224
#[inline(always)] pub fn exp<T: Exponential>(value: T) -> T { value.exp() }
225+
/// Returns 2 raised to the power of the number, `2^(value)`.
176226
#[inline(always)] pub fn exp2<T: Exponential>(value: T) -> T { value.exp2() }
177227

228+
/// Returns the natural logarithm of the number.
178229
#[inline(always)] pub fn ln<T: Exponential>(value: T) -> T { value.ln() }
230+
/// Returns the logarithm of the number with respect to an arbitrary base.
179231
#[inline(always)] pub fn log<T: Exponential>(value: T, base: T) -> T { value.log(&base) }
232+
/// Returns the base 2 logarithm of the number.
180233
#[inline(always)] pub fn log2<T: Exponential>(value: T) -> T { value.log2() }
234+
/// Returns the base 10 logarithm of the number.
181235
#[inline(always)] pub fn log10<T: Exponential>(value: T) -> T { value.log10() }
182236

183237
pub trait Hyperbolic: Exponential {
@@ -190,12 +244,18 @@ pub trait Hyperbolic: Exponential {
190244
fn atanh(&self) -> Self;
191245
}
192246

247+
/// Hyperbolic cosine function.
193248
#[inline(always)] pub fn sinh<T: Hyperbolic>(value: T) -> T { value.sinh() }
249+
/// Hyperbolic sine function.
194250
#[inline(always)] pub fn cosh<T: Hyperbolic>(value: T) -> T { value.cosh() }
251+
/// Hyperbolic tangent function.
195252
#[inline(always)] pub fn tanh<T: Hyperbolic>(value: T) -> T { value.tanh() }
196253

254+
/// Inverse hyperbolic sine function.
197255
#[inline(always)] pub fn asinh<T: Hyperbolic>(value: T) -> T { value.asinh() }
256+
/// Inverse hyperbolic cosine function.
198257
#[inline(always)] pub fn acosh<T: Hyperbolic>(value: T) -> T { value.acosh() }
258+
/// Inverse hyperbolic tangent function.
199259
#[inline(always)] pub fn atanh<T: Hyperbolic>(value: T) -> T { value.atanh() }
200260

201261
/// Defines constants and methods common to real numbers
@@ -345,8 +405,16 @@ pub trait Float: Real
345405
fn next_after(&self, other: Self) -> Self;
346406
}
347407

408+
/// Returns the exponential of the number, minus `1`, `exp(n) - 1`, in a way
409+
/// that is accurate even if the number is close to zero.
348410
#[inline(always)] pub fn exp_m1<T: Float>(value: T) -> T { value.exp_m1() }
411+
/// Returns the natural logarithm of the number plus `1`, `ln(n + 1)`, more
412+
/// accurately than if the operations were performed separately.
349413
#[inline(always)] pub fn ln_1p<T: Float>(value: T) -> T { value.ln_1p() }
414+
/// Fused multiply-add. Computes `(a * b) + c` with only one rounding error.
415+
///
416+
/// This produces a more accurate result with better performance (on some
417+
/// architectures) than a separate multiplication operation followed by an add.
350418
#[inline(always)] pub fn mul_add<T: Float>(a: T, b: T, c: T) -> T { a.mul_add(b, c) }
351419

352420
/// A generic trait for converting a value to a number.
@@ -788,7 +856,7 @@ impl_from_primitive!(u64, n.to_u64())
788856
impl_from_primitive!(f32, n.to_f32())
789857
impl_from_primitive!(f64, n.to_f64())
790858

791-
/// Cast from one machine scalar to another
859+
/// Cast from one machine scalar to another.
792860
///
793861
/// # Example
794862
///
@@ -841,7 +909,7 @@ pub trait FromStrRadix {
841909
fn from_str_radix(str: &str, radix: uint) -> Option<Self>;
842910
}
843911

844-
/// A utility function that just calls FromStrRadix::from_str_radix
912+
/// A utility function that just calls FromStrRadix::from_str_radix.
845913
pub fn from_str_radix<T: FromStrRadix>(str: &str, radix: uint) -> Option<T> {
846914
FromStrRadix::from_str_radix(str, radix)
847915
}

0 commit comments

Comments
 (0)