From a68875cc7f411a92111f515a9c256df11cfd6c7d Mon Sep 17 00:00:00 2001 From: Daniel Strobusch <1847260+dastrobu@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:05:55 +0100 Subject: [PATCH] fix lint warnings --- .github/workflows/ci.yaml | 2 ++ Sources/NdArray/basic_functions.swift | 4 ++-- Tests/NdArrayTests/NdArrayTests.swift | 11 +++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3fbf76a..ab2909f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,8 @@ jobs: steps: - uses: actions/checkout@v2 - uses: norio-nomura/action-swiftlint@3.2.1 + with: + args: --strict test: strategy: matrix: diff --git a/Sources/NdArray/basic_functions.swift b/Sources/NdArray/basic_functions.swift index 4422789..4d3075e 100644 --- a/Sources/NdArray/basic_functions.swift +++ b/Sources/NdArray/basic_functions.swift @@ -15,7 +15,7 @@ public func abs>(_ a: T) -> T where K: Comparabl // Double public func abs>(_ a: T, out b: T) { - a.apply1d(other: b, f1d: { n in + a.apply1d(other: b, f1d: { _ in vDSP_vabsD(a.data, a.strides[0], b.data, b.strides[0], vDSP_Length(a.shape[0])) }, fContiguous: { n in vDSP_vabsD(a.data, 1, b.data, 1, vDSP_Length(n)) @@ -33,7 +33,7 @@ public func abs>(_ a: T) -> T { // Float public func abs>(_ a: T, out b: T) { - a.apply1d(other: b, f1d: { n in + a.apply1d(other: b, f1d: { _ in vDSP_vabs(a.data, a.strides[0], b.data, b.strides[0], vDSP_Length(a.shape[0])) }, fContiguous: { n in vDSP_vabs(a.data, 1, b.data, 1, vDSP_Length(n)) diff --git a/Tests/NdArrayTests/NdArrayTests.swift b/Tests/NdArrayTests/NdArrayTests.swift index 27a1a46..11f8813 100644 --- a/Tests/NdArrayTests/NdArrayTests.swift +++ b/Tests/NdArrayTests/NdArrayTests.swift @@ -36,16 +36,15 @@ final class NdArrayTests: XCTestCase { } func testNdArrayShouldCopyCorrectlyWhenStrideIsNotSizeOfT() { - // swiftlint:disable:next nesting type_name - struct S: Equatable { + struct MyType: Equatable { let i: Int let b: Bool } - XCTAssertNotEqual(MemoryLayout.size, MemoryLayout.stride) - let a = NdArray([S(i: 0, b: true), S(i: 1, b: false)]) - let b = NdArray(copy: a) - XCTAssertEqual(b.dataArray, [S(i: 0, b: true), S(i: 1, b: false)]) + XCTAssertNotEqual(MemoryLayout.size, MemoryLayout.stride) + let a = NdArray([MyType(i: 0, b: true), MyType(i: 1, b: false)]) + let b = NdArray(copy: a) + XCTAssertEqual(b.dataArray, [MyType(i: 0, b: true), MyType(i: 1, b: false)]) } func testDescription() {