Revved rust from 1.62.1 to 1.67.1

- Address Clippy warnings while upgrading from 1.62.1 to 1.67.1
- A fix for the change in signal masking introduced in rust-lang/rust#101077
- Changes to address an instance of https://rust-lang.github.io/rust-clippy/master/index.html\#result_large_err

Signed-off-by: Jason Heath <jason.heath@progress.com>

Author: Jason Heath

.rustfmt.toml

@@ -6,7 +6,7 @@ unstable_features = true
 
 # stable options
 edition = "2018"
-fn_args_layout = "Tall"
+fn_params_layout = "Tall"
 force_explicit_abi = true
 format_code_in_doc_comments = true
 hard_tabs = false

components/builder-api-client/src/builder.rs

@@ -190,7 +190,7 @@ impl BuilderAPIClient {
         let resp = self.maybe_add_authz(rb, token).send().await?;
         let resp = response::ok_if(resp, &[StatusCode::OK]).await?;
 
-        fs::create_dir_all(&dst_path)?;
+        fs::create_dir_all(dst_path)?;
         let file_name = response::get_header(&resp, X_FILENAME)?;
         let dst_file_path = dst_path.join(file_name);
         let w = AtomicWriter::new_with_permissions(&dst_file_path, permissions)?;
@@ -1609,7 +1609,7 @@ mod tests {
                 (range, (range + step).min(last))
             };
             let filtered_range = filtered[start..=end].iter()
-                                                      .map(|s| get_test_ident(**s))
+                                                      .map(|s| get_test_ident(s))
                                                       .collect::<Vec<_>>();
             let result = PackageResults { range_start: start as isize,
                                           range_end:   end as isize,

components/butterfly/src/client.rs

@@ -81,6 +81,6 @@ impl Client {
     {
         let bytes = rumor.write_to_bytes()?;
         let wire_msg = message::generate_wire(bytes, self.ring_key.as_ref())?;
-        self.socket.send(&wire_msg, 0).map_err(Error::ZmqSendError)
+        self.socket.send(wire_msg, 0).map_err(Error::ZmqSendError)
     }
 }

components/butterfly/src/member.rs

@@ -174,7 +174,7 @@ impl Default for Member {
 }
 
 impl From<Member> for RumorKey {
-    fn from(member: Member) -> RumorKey { RumorKey::new(RumorType::Member, &member.id, "") }
+    fn from(member: Member) -> RumorKey { RumorKey::new(RumorType::Member, member.id, "") }
 }
 
 impl<'a> From<&'a Member> for RumorKey {

components/butterfly/src/protocol/swim.rs

@@ -24,10 +24,10 @@ mod tests {
 
     #[test]
     fn health_values_are_title_case() {
-        assert_eq!(serde_json::to_value(&Health::Alive).unwrap(), "Alive");
-        assert_eq!(serde_json::to_value(&Health::Suspect).unwrap(), "Suspect");
-        assert_eq!(serde_json::to_value(&Health::Confirmed).unwrap(),
+        assert_eq!(serde_json::to_value(Health::Alive).unwrap(), "Alive");
+        assert_eq!(serde_json::to_value(Health::Suspect).unwrap(), "Suspect");
+        assert_eq!(serde_json::to_value(Health::Confirmed).unwrap(),
                    "Confirmed");
-        assert_eq!(serde_json::to_value(&Health::Departed).unwrap(), "Departed");
+        assert_eq!(serde_json::to_value(Health::Departed).unwrap(), "Departed");
     }
 }

components/butterfly/src/rumor/dat_file.rs

@@ -368,7 +368,7 @@ impl DatFile {
     {
         let mut bytes_read = 0;
         let mut size_buf = [0; 8];
-        let mut rumor_buf: Vec<u8> = vec![];
+        let mut rumor_buf: Vec<u8> = vec![0; 8];
 
         loop {
             if bytes_read >= offset {

components/butterfly/src/rumor/heat.rs

@@ -75,7 +75,7 @@ pub(crate) mod sync {
                     .collect();
 
             // Reverse sorting by heat; 0s come last!
-            rumor_heat.sort_by(|&(_, ref h1), &(_, ref h2)| h2.cmp(h1));
+            rumor_heat.sort_by(|(_, h1), (_, h2)| h2.cmp(h1));
 
             // We don't need the heat anymore, just return the rumors.
             rumor_heat.into_iter().map(|(k, _)| k).collect()

components/butterfly/src/server.rs

@@ -748,7 +748,7 @@ impl Server {
                     rumor_heat.lock_rhw().purge(member_id_to_depart);
                     rumor_heat.lock_rhw()
                               .start_hot_rumor(RumorKey::new(RumorType::Member,
-                                                             &*member_id_to_depart,
+                                                             member_id_to_depart,
                                                              ""));
                 }
             }

components/butterfly/src/server/incarnation_store.rs

@@ -97,7 +97,7 @@ mod tests {
                 "The path {:?} shouldn't exist, but it does",
                 path);
 
-        let i = IncarnationStore::new(&path);
+        let i = IncarnationStore::new(path);
         assert!(i.load().is_err());
     }
 
@@ -155,13 +155,13 @@ mod tests {
         let tempfile = Temp::new_file().expect("Could not create temp file");
         let path = tempfile.as_ref();
 
-        let mut buffer = File::create(&path).expect("could not create file");
+        let mut buffer = File::create(path).expect("could not create file");
         buffer.write_all(b"this, also, is not a u64")
               .expect("could not write file");
 
         assert!(path.exists());
 
-        let mut i = IncarnationStore::new(&path);
+        let mut i = IncarnationStore::new(path);
         assert!(i.initialize().is_err());
     }
 }

components/common/src/cli.rs

@@ -61,7 +61,7 @@ pub fn is_toml_file(val: &str) -> bool {
 }
 
 pub fn file_into_idents(path: &str) -> Result<Vec<PackageIdent>, habitat_core::error::Error> {
-    let s = std::fs::read_to_string(&path).map_err(|_| {
+    let s = std::fs::read_to_string(path).map_err(|_| {
                 habitat_core::error::Error::FileNotFound(format!("Could not open file {}", path))
             })?;