Merge pull request volta-cli#940 from charlespierce/clippy_warnings

Fix clippy warnings, formatting, and M1 build

ci/build-for-arm.sh

@@ -4,7 +4,7 @@ set -e
 
 echo "Building Volta"
 
-SDKROOT=$(xcrun -sdk macosx11.0 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=11.0 cargo build --release --target=aarch64-apple-darwin
+SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=11.0 cargo build --release --target=aarch64-apple-darwin
 
 echo "Packaging Binaries"
 

crates/volta-core/src/tool/node/metadata.rs

@@ -52,6 +52,7 @@ impl From<RawNodeIndex> for NodeIndex {
     }
 }
 
+#[allow(clippy::unnecessary_wraps)] // Needs to match the API expected by Serde
 fn lts_version_serde<'de, D>(deserializer: D) -> Result<bool, D::Error>
 where
     D: Deserializer<'de>,

crates/volta-core/src/tool/serial.rs

@@ -140,9 +140,9 @@ fn is_version_like(value: &str) -> bool {
     matches!(
         value.parse(),
         Ok(VersionSpec::Exact(_))
-        | Ok(VersionSpec::Semver(_))
-        | Ok(VersionSpec::Tag(VersionTag::Latest))
-        | Ok(VersionSpec::Tag(VersionTag::Lts))
+            | Ok(VersionSpec::Semver(_))
+            | Ok(VersionSpec::Tag(VersionTag::Latest))
+            | Ok(VersionSpec::Tag(VersionTag::Lts))
     )
 }
 

crates/volta-migrate/src/lib.rs

@@ -93,6 +93,7 @@ impl MigrationState {
         }
     }
 
+    #[allow(clippy::unnecessary_wraps)] // Needs to be Fallible for Unix
     fn detect_legacy_state(home: &Path) -> Fallible<Self> {
         /*
         Triage for determining the legacy layout version:

src/command/list/human.rs

@@ -20,6 +20,7 @@ lazy_static! {
             .subsequent_indent(INDENTATION);
 }
 
+#[allow(clippy::unnecessary_wraps)] // Needs to match the API of `plain::format`
 pub(super) fn format(toolchain: &Toolchain) -> Option<String> {
     // Formatting here depends on the toolchain: we do different degrees of
     // indentation