diff options
| author | bors <bors@rust-lang.org> | 2019-02-27 15:54:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-27 15:54:48 +0000 |
| commit | 7e001e5c6c7c090b41416a57d4be412ed3ccd937 (patch) | |
| tree | ce855b209ccee43fab95888a7778c0414611da2e /src/libcore | |
| parent | 485537074062d6310178101b198606573527723c (diff) | |
| parent | 1394b6f3a1e607e3651f90e929ccd357c9f8bf80 (diff) | |
| download | rust-7e001e5c6c7c090b41416a57d4be412ed3ccd937.tar.gz rust-7e001e5c6c7c090b41416a57d4be412ed3ccd937.zip | |
Auto merge of #58777 - Centril:rollup, r=Centril
Rollup of 14 pull requests
Successful merges:
- #58075 (Fix for issue #58050)
- #58627 (rustdoc: move collapse and unindent docs passes earlier)
- #58630 (Make `visit_clobber` panic-safe.)
- #58678 (Deny `async fn` in 2015 edition)
- #58680 (Fix an indexing error when using `x.py help`)
- #58703 (Fix copy-pasted typo for read_string return value)
- #58744 (Update dlmalloc to 0.1.3)
- #58746 (std: docs: Disable running several Stdio doctests)
- #58748 (update scoped_tls to 1.0)
- #58749 (Reduce Repetitions of (n << amt) >> amt)
- #58752 (Update string_cache_codegen to 0.4.2)
- #58755 (Clarify `rotate_{left,right}` docs)
- #58757 (Normalize the type Self resolves to in an impl)
- #58761 (Add tracking issue for the unwind attribute)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/num/mod.rs | 8 | ||||
| -rw-r--r-- | src/libcore/num/wrapping.rs | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 3ceba83afee..6708a195f88 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -346,7 +346,7 @@ $EndFeature, " concat!("Shifts the bits to the left by a specified amount, `n`, wrapping the truncated bits to the end of the resulting integer. -Please note this isn't the same operation as `<<`! +Please note this isn't the same operation as the `<<` shifting operator! # Examples @@ -370,7 +370,7 @@ assert_eq!(n.rotate_left(", $rot, "), m); wrapping the truncated bits to the beginning of the resulting integer. -Please note this isn't the same operation as `>>`! +Please note this isn't the same operation as the `>>` shifting operator! # Examples @@ -2300,7 +2300,7 @@ assert_eq!(n.trailing_zeros(), 3);", $EndFeature, " concat!("Shifts the bits to the left by a specified amount, `n`, wrapping the truncated bits to the end of the resulting integer. -Please note this isn't the same operation as `<<`! +Please note this isn't the same operation as the `<<` shifting operator! # Examples @@ -2324,7 +2324,7 @@ assert_eq!(n.rotate_left(", $rot, "), m); wrapping the truncated bits to the beginning of the resulting integer. -Please note this isn't the same operation as `>>`! +Please note this isn't the same operation as the `>>` shifting operator! # Examples diff --git a/src/libcore/num/wrapping.rs b/src/libcore/num/wrapping.rs index 50e189c9e36..9cd5108ade4 100644 --- a/src/libcore/num/wrapping.rs +++ b/src/libcore/num/wrapping.rs @@ -429,7 +429,8 @@ assert_eq!(n.trailing_zeros(), 3); /// wrapping the truncated bits to the end of the resulting /// integer. /// - /// Please note this isn't the same operation as `>>`! + /// Please note this isn't the same operation as the `>>` shifting + /// operator! /// /// # Examples /// @@ -454,7 +455,8 @@ assert_eq!(n.trailing_zeros(), 3); /// wrapping the truncated bits to the beginning of the resulting /// integer. /// - /// Please note this isn't the same operation as `<<`! + /// Please note this isn't the same operation as the `<<` shifting + /// operator! /// /// # Examples /// |