chore: upgrade to rust 1.66.0 (vectordotdev#15093)

* chore: upgrade to rust 1.65.0

Signed-off-by: Luke Steensen <[email protected]>

* Fix bool-to-int clippy lint

* Fix another lint

* bump to 1.66.0

Signed-off-by: Luke Steensen <[email protected]>

* clippy fixes

Signed-off-by: Luke Steensen <[email protected]>

* clippy build.rs

Signed-off-by: Luke Steensen <[email protected]>

* more fixes

Signed-off-by: Luke Steensen <[email protected]>

* map_or with identity is unwrap_or

Signed-off-by: Luke Steensen <[email protected]>

Signed-off-by: Luke Steensen <[email protected]>
Co-authored-by: Bruce Guenter <[email protected]>

Author: lukesteensen

.cargo/config.toml

@@ -24,3 +24,7 @@ rustflags = ["-C", "link-args=-rdynamic"]
 
 [target.aarch64-unknown-linux-gnu]
 rustflags = ["-C", "link-args=-rdynamic"]
+
+[target.x86_64-pc-windows-msvc]
+# https://github.com/dtolnay/inventory/issues/58
+rustflags = ["-C", "codegen-units=1"]

Cargo.toml

@@ -10,7 +10,7 @@ readme = "README.md"
 publish = false
 default-run = "vector"
 autobenches = false # our benchmarks are not runnable on their own either way
-rust-version = "1.64.0"
+rust-version = "1.66.0"
 
 [[bin]]
 name = "vector"
@@ -34,9 +34,6 @@ path = "src/config/loading/secret_backend_example.rs"
 test = false
 bench = false
 
-[profile.dev]
-split-debuginfo = "unpacked" # Faster debug builds on macOS
-
 # CI-based builds use full release optimization.  See scripts/environment/release-flags.sh.
 # This results in roughly a 5% reduction in performance when compiling locally vs when
 # compiled via the CI pipeline.

Tiltfile

@@ -7,7 +7,7 @@ load('ext://helm_resource', 'helm_resource', 'helm_repo')
 docker_build(
     ref='timberio/vector',
     context='.',
-    build_args={'RUST_VERSION': '1.64'},
+    build_args={'RUST_VERSION': '1.66'},
     dockerfile='tilt/Dockerfile'
     )
 

build.rs

@@ -71,7 +71,7 @@ impl BuildConstants {
         let base_dir = env::var("OUT_DIR").expect("OUT_DIR not present in build script!");
         let dest_path = Path::new(&base_dir).join(file_name);
 
-        let mut output_file = File::create(&dest_path)?;
+        let mut output_file = File::create(dest_path)?;
         output_file.write_all(
             "// AUTOGENERATED CONSTANTS. SEE BUILD.RS AT REPOSITORY ROOT. DO NOT MODIFY.\n"
                 .as_ref(),
@@ -108,7 +108,7 @@ fn main() {
         println!("cargo:rerun-if-changed=proto/vector.proto");
 
         let mut prost_build = prost_build::Config::new();
-        prost_build.btree_map(&["."]);
+        prost_build.btree_map(["."]);
 
         tonic_build::configure()
             .protoc_arg("--experimental_allow_proto3_optional")

lib/datadog/grok/src/grok.rs

@@ -64,7 +64,7 @@ impl<'a> Iterator for MatchesIter<'a> {
         // that index, if anything.
         self.names.next().map(|(k, v)| {
             let key = k.as_str();
-            let value = self.captures.at(*v as usize).unwrap_or("");
+            let value = self.captures.at(*v).unwrap_or("");
             (key, value)
         })
     }

lib/file-source/src/file_server.rs

@@ -114,7 +114,7 @@ where
         }
 
         existing_files.sort_by_key(|(path, _file_id)| {
-            fs::metadata(&path)
+            fs::metadata(path)
                 .and_then(|m| m.created())
                 .map(DateTime::<Utc>::from)
                 .unwrap_or_else(|_| Utc::now())
@@ -206,8 +206,8 @@ where
                                 );
                                 let (old_path, new_path) = (&watcher.path, &path);
                                 if let (Ok(old_modified_time), Ok(new_modified_time)) = (
-                                    fs::metadata(&old_path).and_then(|m| m.modified()),
-                                    fs::metadata(&new_path).and_then(|m| m.modified()),
+                                    fs::metadata(old_path).and_then(|m| m.modified()),
+                                    fs::metadata(new_path).and_then(|m| m.modified()),
                                 ) {
                                     if old_modified_time < new_modified_time {
                                         info!(

lib/file-source/src/fingerprinter.rs

@@ -249,10 +249,10 @@ mod test {
         let full_line_path = target_dir.path().join("full_line.log");
         let duplicate_path = target_dir.path().join("duplicate.log");
         let not_full_line_path = target_dir.path().join("not_full_line.log");
-        fs::write(&empty_path, &[]).unwrap();
+        fs::write(&empty_path, []).unwrap();
         fs::write(&full_line_path, &full_line_data).unwrap();
         fs::write(&duplicate_path, &full_line_data).unwrap();
-        fs::write(&not_full_line_path, &not_full_line_data).unwrap();
+        fs::write(&not_full_line_path, not_full_line_data).unwrap();
 
         let mut buf = Vec::new();
         assert!(fingerprinter
@@ -417,8 +417,8 @@ mod test {
         let small_path = target_dir.path().join("small.log");
         let medium_path = target_dir.path().join("medium.log");
         let duplicate_path = target_dir.path().join("duplicate.log");
-        fs::write(&empty_path, &[]).unwrap();
-        fs::write(&small_path, &small_data).unwrap();
+        fs::write(&empty_path, []).unwrap();
+        fs::write(&small_path, small_data).unwrap();
         fs::write(&medium_path, &medium_data).unwrap();
         fs::write(&duplicate_path, &medium_data).unwrap();
 

lib/k8s-test-framework/src/namespace.rs

@@ -47,7 +47,7 @@ impl up_down::CommandBuilder for CommandBuilder {
                 up_down::CommandToBuild::Down => "delete",
             })
             .arg("--filename")
-            .arg(&self.config.test_namespace_resource_file.path());
+            .arg(self.config.test_namespace_resource_file.path());
 
         if matches!(command_to_build, up_down::CommandToBuild::Down) {
             // We don't need a graceful shutdown

lib/lookup/src/lookup_buf/mod.rs

@@ -314,7 +314,7 @@ impl Serialize for LookupBuf {
     where
         S: Serializer,
     {
-        serializer.serialize_str(&*ToString::to_string(self))
+        serializer.serialize_str(&ToString::to_string(self))
     }
 }
 

lib/lookup/src/lookup_v2/jit.rs

@@ -286,7 +286,7 @@ impl<'a> Iterator for JitValuePathIter<'a> {
                                 self.coalesce_count += 1;
                                 (
                                     Some(Some(BorrowedSegment::CoalesceField(Cow::Borrowed(
-                                        &self.path[(start as usize)..(end as usize)],
+                                        &self.path[start..end],
                                     )))),
                                     JitState::CoalesceStart,
                                 )
@@ -298,7 +298,7 @@ impl<'a> Iterator for JitValuePathIter<'a> {
                                     self.coalesce_count = 0;
                                     (
                                         Some(Some(BorrowedSegment::CoalesceEnd(Cow::Borrowed(
-                                            &self.path[(start as usize)..(end as usize)],
+                                            &self.path[start..end],
                                         )))),
                                         JitState::Continue,
                                     )