Skip to content

Commit

Permalink
Auto merge of rust-lang#59745 - cwhakes:master, r=sanxiyn
Browse files Browse the repository at this point in the history
Change `copytest` parameter name from `y` to `sign`

This should help clarify ambiguity with whether `a.copysign(b)` applies the sign of `a` to `b` or `b` to `a`.

r? @Centril
  • Loading branch information
bors committed Apr 6, 2019
2 parents 2982dbf + 350e492 commit 209b0b4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions src/libstd/f32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ impl f32 {
}

/// Returns a number composed of the magnitude of `self` and the sign of
/// `y`.
/// `sign`.
///
/// Equal to `self` if the sign of `self` and `y` are the same, otherwise
/// Equal to `self` if the sign of `self` and `sign` are the same, otherwise
/// equal to `-self`. If `self` is a `NAN`, then a `NAN` with the sign of
/// `y` is returned.
/// `sign` is returned.
///
/// # Examples
///
Expand All @@ -216,8 +216,8 @@ impl f32 {
#[inline]
#[must_use]
#[stable(feature = "copysign", since = "1.35.0")]
pub fn copysign(self, y: f32) -> f32 {
unsafe { intrinsics::copysignf32(self, y) }
pub fn copysign(self, sign: f32) -> f32 {
unsafe { intrinsics::copysignf32(self, sign) }
}

/// Fused multiply-add. Computes `(self * a) + b` with only one rounding
Expand Down
10 changes: 5 additions & 5 deletions src/libstd/f64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ impl f64 {
}

/// Returns a number composed of the magnitude of `self` and the sign of
/// `y`.
/// `sign`.
///
/// Equal to `self` if the sign of `self` and `y` are the same, otherwise
/// Equal to `self` if the sign of `self` and `sign` are the same, otherwise
/// equal to `-self`. If `self` is a `NAN`, then a `NAN` with the sign of
/// `y` is returned.
/// `sign` is returned.
///
/// # Examples
///
Expand All @@ -194,8 +194,8 @@ impl f64 {
#[inline]
#[must_use]
#[stable(feature = "copysign", since = "1.35.0")]
pub fn copysign(self, y: f64) -> f64 {
unsafe { intrinsics::copysignf64(self, y) }
pub fn copysign(self, sign: f64) -> f64 {
unsafe { intrinsics::copysignf64(self, sign) }
}

/// Fused multiply-add. Computes `(self * a) + b` with only one rounding
Expand Down

0 comments on commit 209b0b4

Please sign in to comment.