diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-02-27 14:38:06 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 14:38:06 +0900 |
| commit | d4700a83ce1721b94f2aa3ce070cf86c82cb9979 (patch) | |
| tree | 871b191f3bb40f62f2864cab6a6a8ce5fdac791b /src | |
| parent | 4cc0295be5f9dc7089d5b762dfeaf3754b3623f2 (diff) | |
| parent | 1a6b930eebe39aa11d948815b9cd9b792a6de8b4 (diff) | |
| download | rust-d4700a83ce1721b94f2aa3ce070cf86c82cb9979.tar.gz rust-d4700a83ce1721b94f2aa3ce070cf86c82cb9979.zip | |
Rollup merge of #69479 - matthiaskrgr:op_pred, r=Dylan-DPC
clarify operator precedence
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/hash/sip.rs | 2 | ||||
| -rw-r--r-- | src/librustc/ty/query/on_disk_cache.rs | 2 | ||||
| -rw-r--r-- | src/librustc_data_structures/sip128.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/hash/sip.rs b/src/libcore/hash/sip.rs index c4fbd9dbada..aa50e7cdf57 100644 --- a/src/libcore/hash/sip.rs +++ b/src/libcore/hash/sip.rs @@ -304,7 +304,7 @@ impl<S: Sip> super::Hasher for Hasher<S> { if self.ntail != 0 { needed = 8 - self.ntail; - self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << 8 * self.ntail; + self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << (8 * self.ntail); if length < needed { self.ntail += length; return; diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs index 0fb5f66feca..f96bf6c110c 100644 --- a/src/librustc/ty/query/on_disk_cache.rs +++ b/src/librustc/ty/query/on_disk_cache.rs @@ -997,7 +997,7 @@ impl SpecializedEncoder<IntEncodedWithFixedSize> for opaque::Encoder { fn specialized_encode(&mut self, x: &IntEncodedWithFixedSize) -> Result<(), Self::Error> { let start_pos = self.position(); for i in 0..IntEncodedWithFixedSize::ENCODED_SIZE { - ((x.0 >> i * 8) as u8).encode(self)?; + ((x.0 >> (i * 8)) as u8).encode(self)?; } let end_pos = self.position(); assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE); diff --git a/src/librustc_data_structures/sip128.rs b/src/librustc_data_structures/sip128.rs index af0e9f79fe1..beb28dd0720 100644 --- a/src/librustc_data_structures/sip128.rs +++ b/src/librustc_data_structures/sip128.rs @@ -274,7 +274,7 @@ impl Hasher for SipHasher128 { if self.ntail != 0 { needed = 8 - self.ntail; - self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << 8 * self.ntail; + self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << (8 * self.ntail); if length < needed { self.ntail += length; return; |