From d48cbc175654dfaf34e8769a47abf477455c8aa3 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 29 May 2024 09:04:37 -0500
Subject: [PATCH] style: Make clippy happy

---
 src/bin/upgrade/upgrade.rs | 15 +++++----------
 src/manifest.rs            |  5 ++---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/bin/upgrade/upgrade.rs b/src/bin/upgrade/upgrade.rs
index fbb52b2d2f..42d6863a78 100644
--- a/src/bin/upgrade/upgrade.rs
+++ b/src/bin/upgrade/upgrade.rs
@@ -306,7 +306,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
                             }
                         }
                     }
-                    let latest_compatible = semver::VersionReq::parse(&old_version_req)
+                    let latest_compatible = VersionReq::parse(&old_version_req)
                         .ok()
                         .and_then(|old_version_req| {
                             get_compatible_dependency(
@@ -482,7 +482,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> {
             .iter()
             .filter_map(|(name, req)| {
                 req.as_ref()
-                    .and_then(|req| semver::VersionReq::parse(req).ok())
+                    .and_then(|req| VersionReq::parse(req).ok())
                     .and_then(|req| {
                         let precise = precise_version(&req)?;
                         Some((name, (req, precise)))
@@ -709,12 +709,7 @@ fn precise_version(version_req: &VersionReq) -> Option<String> {
             matches!(
                 c.op,
                 // Only ops we can determine a precise version from
-                semver::Op::Exact
-                    | semver::Op::GreaterEq
-                    | semver::Op::LessEq
-                    | semver::Op::Tilde
-                    | semver::Op::Caret
-                    | semver::Op::Wildcard
+                Op::Exact | Op::GreaterEq | Op::LessEq | Op::Tilde | Op::Caret | Op::Wildcard
             )
         })
         .filter_map(|c| {
@@ -794,7 +789,7 @@ impl Dep {
             .and_then(|v| semver::Version::parse(v).ok())
         {
             if let Some(new_version_req) = &self.new_version_req {
-                if let Ok(new_version_req) = semver::VersionReq::parse(new_version_req) {
+                if let Ok(new_version_req) = VersionReq::parse(new_version_req) {
                     if !new_version_req.matches(&latest_version) {
                         spec.set_fg(Some(Color::Red));
                     }
@@ -853,7 +848,7 @@ impl Dep {
             .and_then(|v| semver::Version::parse(v).ok())
         {
             if let Some(old_version_req) = &self.old_version_req {
-                if let Ok(old_version_req) = semver::VersionReq::parse(old_version_req) {
+                if let Ok(old_version_req) = VersionReq::parse(old_version_req) {
                     return old_version_req.matches(&latest_version);
                 }
             }
diff --git a/src/manifest.rs b/src/manifest.rs
index 0dab347cfe..4eb1cfff09 100644
--- a/src/manifest.rs
+++ b/src/manifest.rs
@@ -218,8 +218,7 @@ impl LocalManifest {
         if !path.is_absolute() {
             anyhow::bail!("can only edit absolute paths, got {}", path.display());
         }
-        let data =
-            std::fs::read_to_string(path).with_context(|| "Failed to read manifest contents")?;
+        let data = fs::read_to_string(path).with_context(|| "Failed to read manifest contents")?;
         let manifest = data.parse().context("Unable to parse Cargo.toml")?;
         Ok(LocalManifest {
             manifest,
@@ -232,7 +231,7 @@ impl LocalManifest {
         let s = self.manifest.data.to_string();
         let new_contents_bytes = s.as_bytes();
 
-        std::fs::write(&self.path, new_contents_bytes).context("Failed to write updated Cargo.toml")
+        fs::write(&self.path, new_contents_bytes).context("Failed to write updated Cargo.toml")
     }
 
     /// Remove entry from a Cargo.toml.