diff --git a/ci/build-for-arm.sh b/ci/build-for-arm.sh index 65a923117..54247ac39 100755 --- a/ci/build-for-arm.sh +++ b/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" diff --git a/crates/volta-core/src/tool/node/metadata.rs b/crates/volta-core/src/tool/node/metadata.rs index 90d6d8fb4..c5e773f1f 100644 --- a/crates/volta-core/src/tool/node/metadata.rs +++ b/crates/volta-core/src/tool/node/metadata.rs @@ -52,6 +52,7 @@ impl From for NodeIndex { } } +#[allow(clippy::unnecessary_wraps)] // Needs to match the API expected by Serde fn lts_version_serde<'de, D>(deserializer: D) -> Result where D: Deserializer<'de>, diff --git a/crates/volta-core/src/tool/serial.rs b/crates/volta-core/src/tool/serial.rs index 21eabd335..b3743cede 100644 --- a/crates/volta-core/src/tool/serial.rs +++ b/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)) ) } diff --git a/crates/volta-migrate/src/lib.rs b/crates/volta-migrate/src/lib.rs index 50be59a7a..8def61cc4 100644 --- a/crates/volta-migrate/src/lib.rs +++ b/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 { /* Triage for determining the legacy layout version: diff --git a/src/command/list/human.rs b/src/command/list/human.rs index 5db253723..bec174cbe 100644 --- a/src/command/list/human.rs +++ b/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 { // Formatting here depends on the toolchain: we do different degrees of // indentation