Bump `enum-iterator' to 1.2.0. Cleanup some

lints

Author: CraZySacX

Cargo.toml

@@ -28,7 +28,7 @@ local_offset = ["time/local-offset"]
 [dependencies]
 anyhow = "1.0.60"
 cfg-if = "1.0.0"
-enum-iterator = "~1.1.3"
+enum-iterator = "1.2.0"
 getset = "0.1.2"
 git2 = { version = "0.15.0", optional = true, default-features = false }
 rustc_version = { version = "0.4.0", optional = true }

src/error.rs

@@ -71,32 +71,32 @@ mod test {
         let err: Error = io::Error::new(ErrorKind::Other, "testing").into();
         assert_eq!(
             "protocol: There was an error writing the cargo instructions to stdout: testing",
-            format!("{}", err)
+            format!("{err}")
         );
     }
 
     #[cfg(feature = "rustc")]
     #[test]
     fn rustc_version_error() {
-        let res = version_meta_for("yoda").map_err(|e| Error::from(e));
+        let res = version_meta_for("yoda").map_err(Error::from);
         assert!(res.is_err());
         let err = res.err().unwrap();
         assert_eq!(
             "protocol: An error occurred in the \'rustc_version\' library: unexpected `rustc -vV` format",
-            format!("{}", err)
+            format!("{err}")
         );
     }
 
     #[cfg(feature = "git")]
     #[test]
     fn git2_error() {
-        let res = Repository::open("blah").map_err(|e| Error::from(e));
+        let res = Repository::open("blah").map_err(Error::from);
         assert!(res.is_err());
         let err = res.err().unwrap();
         #[cfg(target_family = "unix")]
-        assert_eq!("protocol: An error occurred in the \'git2\' library: failed to resolve path \'blah\': No such file or directory; class=Os (2); code=NotFound (-3)", format!("{}", err));
+        assert_eq!("protocol: An error occurred in the \'git2\' library: failed to resolve path \'blah\': No such file or directory; class=Os (2); code=NotFound (-3)", format!("{err}"));
         #[cfg(target_family = "windows")]
-        assert_eq!("protocol: An error occurred in the \'git2\' library: failed to resolve path \'blah\': The system cannot find the file specified.\r\n; class=Os (2); code=NotFound (-3)", format!("{}", err));
+        assert_eq!("protocol: An error occurred in the \'git2\' library: failed to resolve path \'blah\': The system cannot find the file specified.\r\n; class=Os (2); code=NotFound (-3)", format!("{err}"));
     }
 
     #[cfg(all(feature = "si", not(target_os = "macos")))]
@@ -105,18 +105,18 @@ mod test {
         let err: Error = Error::Pid { msg: "test" };
         assert_eq!(
             "protocol: Unable to determine the current process pid: test",
-            format!("{}", err)
+            format!("{err}")
         );
     }
 
     #[test]
     fn var_error() {
-        let res = env::var("yoda").map_err(|e| Error::from(e));
+        let res = env::var("yoda").map_err(Error::from);
         assert!(res.is_err());
         let err = res.err().unwrap();
         assert_eq!(
             "env: The \'CARGO_PKG_VERSION\' environment variable may not be set: environment variable not found",
-            format!("{}", err)
+            format!("{err}")
         );
     }
 }

src/feature/mod.rs

@@ -99,7 +99,7 @@ mod test {
     #[test]
     fn check_add_entry() {
         let mut hm = BTreeMap::new();
-        add_entry(&mut hm, VergenKey::BuildTimestamp, Some("".to_string()));
+        add_entry(&mut hm, VergenKey::BuildTimestamp, Some(String::new()));
         assert!(hm.get(&VergenKey::BuildTimestamp).is_some());
     }
 }

src/gen.rs

@@ -377,43 +377,40 @@ mod test {
     }
 
     #[test]
-    fn describe_falls_back() -> Result<()> {
+    fn describe_falls_back() {
         let no_tags_path = PathBuf::from("testdata").join("notagsrepo");
         assert!(config_from_instructions(
             Instructions::default(),
             Some(no_tags_path),
             &mut io::sink(),
         )
         .is_ok());
-        Ok(())
     }
 
     #[test]
-    fn describe() -> Result<()> {
+    fn describe() {
         let no_tags_path = PathBuf::from("testdata").join("tagsrepo");
         assert!(config_from_instructions(
             Instructions::default(),
             Some(no_tags_path),
             &mut io::sink(),
         )
         .is_ok());
-        Ok(())
     }
 
     #[test]
-    fn detached_head() -> Result<()> {
+    fn detached_head() {
         let dh_path = PathBuf::from("testdata").join("detachedhead");
         assert!(
             config_from_instructions(Instructions::default(), Some(dh_path), &mut io::sink(),)
                 .is_ok()
         );
-        Ok(())
     }
 
     // TODO: Make this a macro to check all toggles
     #[test]
     #[cfg(feature = "build")]
-    fn toggle_works() -> Result<()> {
+    fn toggle_works() {
         use crate::TimestampKind;
         let repo_path = PathBuf::from(".");
         let mut config = Instructions::default();
@@ -423,7 +420,6 @@ mod test {
         assert!(config_from_instructions(config, Some(repo_path), &mut stdout_buf).is_ok());
         let stdout = String::from_utf8_lossy(&stdout_buf);
         assert!(!VBD_REGEX.is_match(&stdout));
-        Ok(())
     }
 
     #[cfg(all(
@@ -581,12 +577,12 @@ mod test {
 
     #[cfg(feature = "rustc")]
     fn check_rustc_output(stdout: &[u8]) {
-        assert!(RUSTC_REGEX.is_match(&String::from_utf8_lossy(&stdout)));
+        assert!(RUSTC_REGEX.is_match(&String::from_utf8_lossy(stdout)));
     }
 
     #[cfg(feature = "rustc")]
     fn check_no_rustc_output(stdout: &[u8]) {
-        assert!(!RUSTC_REGEX.is_match(&String::from_utf8_lossy(&stdout)));
+        assert!(!RUSTC_REGEX.is_match(&String::from_utf8_lossy(stdout)));
     }
 
     #[cfg(all(feature = "build", feature = "local_offset"))]