about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorIgor Matuszewski <Xanewok@gmail.com>2019-06-26 14:04:37 +0200
committerIgor Matuszewski <Xanewok@gmail.com>2019-06-26 14:11:58 +0200
commit6c93b47c010f09d6f1ec8303898984944fdbd6f0 (patch)
tree9a3914bbc710c98e12a2c89f8980f5d3a5dcb8b6 /src/libserialize
parent12806b70506508c4ec187f0223e1e86f89167448 (diff)
downloadrust-6c93b47c010f09d6f1ec8303898984944fdbd6f0.tar.gz
rust-6c93b47c010f09d6f1ec8303898984944fdbd6f0.zip
Fix clippy::cast_losless
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/json.rs12
-rw-r--r--src/libserialize/leb128.rs2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index 826954ce216..a7e7c09f9ae 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -513,7 +513,7 @@ impl<'a> crate::Encoder for Encoder<'a> {
         emit_enquoted_if_mapkey!(self, fmt_number_or_null(v))
     }
     fn emit_f32(&mut self, v: f32) -> EncodeResult {
-        self.emit_f64(v as f64)
+        self.emit_f64(f64::from(v))
     }
 
     fn emit_char(&mut self, v: char) -> EncodeResult {
@@ -763,7 +763,7 @@ impl<'a> crate::Encoder for PrettyEncoder<'a> {
         emit_enquoted_if_mapkey!(self, fmt_number_or_null(v))
     }
     fn emit_f32(&mut self, v: f32) -> EncodeResult {
-        self.emit_f64(v as f64)
+        self.emit_f64(f64::from(v))
     }
 
     fn emit_char(&mut self, v: char) -> EncodeResult {
@@ -1698,12 +1698,12 @@ impl<T: Iterator<Item=char>> Parser<T> {
                             if n2 < 0xDC00 || n2 > 0xDFFF {
                                 return self.error(LoneLeadingSurrogateInHexEscape)
                             }
-                            let c = (((n1 - 0xD800) as u32) << 10 |
-                                     (n2 - 0xDC00) as u32) + 0x1_0000;
+                            let c = (u32::from(n1 - 0xD800) << 10 |
+                                     u32::from(n2 - 0xDC00)) + 0x1_0000;
                             res.push(char::from_u32(c).unwrap());
                         }
 
-                        n => match char::from_u32(n as u32) {
+                        n => match char::from_u32(u32::from(n)) {
                             Some(c) => res.push(c),
                             None => return self.error(InvalidUnicodeCodePoint),
                         },
@@ -2405,7 +2405,7 @@ impl ToJson for Json {
 }
 
 impl ToJson for f32 {
-    fn to_json(&self) -> Json { (*self as f64).to_json() }
+    fn to_json(&self) -> Json { f64::from(*self).to_json() }
 }
 
 impl ToJson for f64 {
diff --git a/src/libserialize/leb128.rs b/src/libserialize/leb128.rs
index 16ff59489e7..f9d80842d75 100644
--- a/src/libserialize/leb128.rs
+++ b/src/libserialize/leb128.rs
@@ -123,7 +123,7 @@ pub fn read_signed_leb128(data: &[u8], start_position: usize) -> (i128, usize) {
     loop {
         byte = data[position];
         position += 1;
-        result |= ((byte & 0x7F) as i128) << shift;
+        result |= i128::from(byte & 0x7F) << shift;
         shift += 7;
 
         if (byte & 0x80) == 0 {