chore(rust): Bump Rust nightly to Version 1.66.0 (2022-12-15)

closes #33

rust-toolchain

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2022-08-06"
+channel = "nightly-2022-12-15"
 profile = "default"

src/error.rs

@@ -22,7 +22,7 @@ impl fmt::Display for Error {
       Error::VlqLeftover => write!(f, "leftover cur/shift in vlq decode"),
       Error::VlqNoValues => write!(f, "vlq decode did not produce any values"),
       Error::VlqOverflow => write!(f, "vlq decode caused an overflow"),
-      Error::BadJson(err) => write!(f, "bad json: {}", err),
+      Error::BadJson(err) => write!(f, "bad json: {err}"),
     }
   }
 }

src/helpers.rs

@@ -221,7 +221,7 @@ impl<'a> Iterator for SegmentIter<'a> {
           if self.nums.len() > 4 {
             self.name_index =
               (i64::from(self.name_index) + self.nums[4]) as u32;
-            name = Some(self.name_index as u32);
+            name = Some(self.name_index);
           }
         }
 
@@ -933,7 +933,7 @@ pub fn stream_chunks_of_combined_source_map(
     let mut r = mappings_data.len() / 5;
     while l < r {
       let m = (l + r) >> 1;
-      if mappings_data[m * 5] <= column as i64 {
+      if mappings_data[m * 5] <= column {
         l = m + 1;
       } else {
         r = m;

src/lib.rs

@@ -1,5 +1,6 @@
 //! Rusty [`webpack-sources`](https://github.com/webpack/webpack-sources) port.
 
+#![feature(let_chains)]
 #![forbid(unsafe_code)]
 #![deny(missing_docs)]
 

src/original_source.rs

@@ -257,7 +257,7 @@ mod tests {
   #[test]
   fn should_return_the_correct_size_for_binary_files() {
     let source = OriginalSource::new(
-      &String::from_utf8(vec![0; 256]).unwrap(),
+      String::from_utf8(vec![0; 256]).unwrap(),
       "file.wasm",
     );
     assert_eq!(source.size(), 256);

src/replace_source.rs

@@ -107,14 +107,16 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> Source for ReplaceSource<T> {
     for replacement in self.replacements.lock().iter() {
       if inner_pos < replacement.start {
         let end_pos = (replacement.start as usize).min(inner_source_code.len());
-        source_code.push_str(
-          inner_source_code.substring(inner_pos as usize, end_pos as usize),
-        );
+        source_code
+          .push_str(inner_source_code.substring(inner_pos as usize, end_pos));
       }
       source_code.push_str(&replacement.content);
-      inner_pos = inner_pos
-        .max(replacement.end)
-        .min(inner_source_code.len() as u32);
+      #[allow(clippy::manual_clamp)]
+      {
+        inner_pos = inner_pos
+          .max(replacement.end)
+          .min(inner_source_code.len() as u32);
+      }
     }
     source_code
       .push_str(inner_source_code.substring(inner_pos as usize, usize::MAX));
@@ -248,7 +250,7 @@ impl<T: Source> StreamChunks for ReplaceSource<T> {
               original.original_column,
               chunk.substring(0, chunk_pos as usize),
             ) {
-            original.original_column += chunk_pos as u32;
+            original.original_column += chunk_pos;
           }
           pos += chunk_pos;
           let line = mapping.generated_line as i64 + generated_line_offset;
@@ -258,7 +260,7 @@ impl<T: Source> StreamChunks for ReplaceSource<T> {
             generated_column_offset = -(chunk_pos as i64);
             generated_column_offset_line = line;
           }
-          mapping.generated_column += chunk_pos as u32;
+          mapping.generated_column += chunk_pos;
         }
 
 				// Is a replacement in the chunk?
@@ -278,7 +280,7 @@ impl<T: Source> StreamChunks for ReplaceSource<T> {
                 name_index: original.name_index.and_then(|name_index| name_index_mapping.borrow().get(&name_index).copied()),
               }),
             });
-            mapping.generated_column += offset as u32;
+            mapping.generated_column += offset;
             chunk_pos += offset;
             pos = next_replacement_pos;
             if let Some(original) = &mut mapping.original
@@ -522,7 +524,7 @@ mod tests {
             .and_then(
               |original| sourcemap.get_source(original.source_index as usize)
             )
-            .map_or("".to_owned(), |source| format!(" [{}]", source)),
+            .map_or("".to_owned(), |source| format!(" [{source}]")),
           token
             .original
             .as_ref()
@@ -538,7 +540,7 @@ mod tests {
             .as_ref()
             .and_then(|original| original.name_index)
             .and_then(|name_index| sourcemap.get_name(name_index as usize))
-            .map_or("".to_owned(), |source| format!(" ({})", source)),
+            .map_or("".to_owned(), |source| format!(" ({source})")),
         )
       })
       .collect()

src/source.rs

@@ -362,7 +362,7 @@ impl TryFrom<RawSourceMap> for SourceMap {
             if is_valid {
               x
             } else {
-              format!("{}/{}", source_root, x)
+              format!("{source_root}/{x}")
             }
           })
           .collect()
@@ -571,6 +571,7 @@ mod tests {
   }
 
   #[test]
+  #[allow(clippy::clone_double_ref)]
   fn clone_available() {
     let a = RawSource::from("a");
     assert_eq!(a, a.clone());
@@ -607,6 +608,7 @@ mod tests {
   }
 
   #[test]
+  #[allow(clippy::clone_double_ref)]
   fn ref_dyn_source_use_hashmap_available() {
     let mut map = HashMap::new();
     let a = &RawSource::from("a") as &dyn Source;