diff options
| author | bors <bors@rust-lang.org> | 2019-06-08 01:34:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-08 01:34:53 +0000 |
| commit | 6312b89fdabce0aedf613391266e08c0deef2324 (patch) | |
| tree | e83b9416488a0e17858bf4e24a51810c003c4712 /src/libstd | |
| parent | d132f544f9d74e3cc047ef211e57eae60b78e5c5 (diff) | |
| parent | b3bdc24a89de1b014490fed3394cd359430eec9f (diff) | |
| download | rust-6312b89fdabce0aedf613391266e08c0deef2324.tar.gz rust-6312b89fdabce0aedf613391266e08c0deef2324.zip | |
Auto merge of #61649 - Centril:rollup-b4nx9k9, r=Centril
Rollup of 7 pull requests Successful merges: - #61223 (Document tuple's Ord behavior as sequential) - #61615 (syntax: Treat error literals in more principled way) - #61616 (parser: Remove `Deref` impl from `Parser`) - #61621 (Clarify when we run steps with ONLY_HOSTS) - #61627 (Add regression test for #61452.) - #61641 (Revert "Make LocalAnalizer visitor iterate instead of recurse") - #61647 (Use stable wrappers in f32/f64::signum) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/f32.rs | 2 | ||||
| -rw-r--r-- | src/libstd/f64.rs | 2 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs index 133540ed6b9..7254c621611 100644 --- a/src/libstd/f32.rs +++ b/src/libstd/f32.rs @@ -188,7 +188,7 @@ impl f32 { if self.is_nan() { NAN } else { - unsafe { intrinsics::copysignf32(1.0, self) } + 1.0_f32.copysign(self) } } diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs index 87467aeed8b..f8bb36ad0a8 100644 --- a/src/libstd/f64.rs +++ b/src/libstd/f64.rs @@ -166,7 +166,7 @@ impl f64 { if self.is_nan() { NAN } else { - unsafe { intrinsics::copysignf64(1.0, self) } + 1.0_f64.copysign(self) } } diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 24f728158c4..42b64d2b5a5 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -683,6 +683,10 @@ mod prim_str { } /// assert_eq!(tuple.2, 'c'); /// ``` /// +/// The sequential nature of the tuple applies to its implementations of various +/// traits. For example, in `PartialOrd` and `Ord`, the elements are compared +/// sequentially until the first non-equal set is found. +/// /// For more about tuples, see [the book](../book/ch03-02-data-types.html#the-tuple-type). /// /// # Trait implementations |
