From f59340c39b9c5763b9b5b06cc750c7f95f4e34c6 Mon Sep 17 00:00:00 2001 From: Robert Payne Date: Sun, 28 Apr 2019 20:43:09 +1200 Subject: [PATCH] Revert "[EXC_BAD_ACCESS] Update LayoutConstraint == operator to support iOS 10 and higher changes (#574)" (#593) This reverts commit bc2b0b93320513eb747b3baf6332c05bacc067b4. --- Source/LayoutConstraint.swift | 22 +++++++++------------- Tests/SnapKitTests/Tests.swift | 30 ------------------------------ 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/Source/LayoutConstraint.swift b/Source/LayoutConstraint.swift index 91fad77..8bb5ed2 100644 --- a/Source/LayoutConstraint.swift +++ b/Source/LayoutConstraint.swift @@ -44,18 +44,14 @@ public class LayoutConstraint : NSLayoutConstraint { } internal func ==(lhs: LayoutConstraint, rhs: LayoutConstraint) -> Bool { - let areLayoutAnchorsEqual: Bool - if #available(iOS 10.0, OSXApplicationExtension 10.12, *) { - areLayoutAnchorsEqual = lhs.firstAnchor === rhs.firstAnchor && - lhs.secondAnchor === rhs.secondAnchor - } else { - areLayoutAnchorsEqual = lhs.firstItem === rhs.firstItem && - lhs.secondItem === rhs.secondItem && - lhs.firstAttribute == rhs.firstAttribute && - lhs.secondAttribute == rhs.secondAttribute + guard lhs.firstItem === rhs.firstItem && + lhs.secondItem === rhs.secondItem && + lhs.firstAttribute == rhs.firstAttribute && + lhs.secondAttribute == rhs.secondAttribute && + lhs.relation == rhs.relation && + lhs.priority == rhs.priority && + lhs.multiplier == rhs.multiplier else { + return false } - return areLayoutAnchorsEqual && - lhs.relation == rhs.relation && - lhs.priority == rhs.priority && - lhs.multiplier == rhs.multiplier + return true } diff --git a/Tests/SnapKitTests/Tests.swift b/Tests/SnapKitTests/Tests.swift index 7a46b2e..a4b587f 100644 --- a/Tests/SnapKitTests/Tests.swift +++ b/Tests/SnapKitTests/Tests.swift @@ -580,34 +580,4 @@ class SnapKitTests: XCTestCase { let higherPriority: ConstraintPriority = ConstraintPriority.high.advanced(by: 1) XCTAssertEqual(higherPriority.value, highPriority.value + 1) } - - func testLayoutConstraintEqual() { - let view1 = View() - let view2 = View() - let layoutConstraint1 = LayoutConstraint(item: view1, - attribute: .top, - relatedBy: .lessThanOrEqual, - toItem: view2, - attribute: .bottom, - multiplier: 2, - constant: 30) - let layoutConstraint2 = LayoutConstraint(item: view1, - attribute: .top, - relatedBy: .lessThanOrEqual, - toItem: view2, - attribute: .bottom, - multiplier: 2, - constant: 30) - let layoutConstraint3 = LayoutConstraint(item: view1, - attribute: .top, - relatedBy: .lessThanOrEqual, - toItem: view2, - attribute: .bottom, - multiplier: 1, - constant: 50) - XCTAssertTrue(layoutConstraint1 == layoutConstraint2) - XCTAssertFalse(layoutConstraint1 == layoutConstraint3) - XCTAssertFalse(layoutConstraint2 == layoutConstraint3) - } - }