Merged in 0.13.0 changes

Source/Constraint.swift

@@ -130,7 +130,7 @@ internal class ConcreteConstraint: Constraint {
     }
     
     internal override func install() -> [LayoutConstraint] {
-        return self.installOnViewUpdatingExisting(false)
+        return self.installOnView(updateExisting: false, file: self.makerFile, line: self.makerLine)
     }
     
     internal override func uninstall() -> Void {
@@ -194,7 +194,7 @@ internal class ConcreteConstraint: Constraint {
         self.priority = priority
     }
     
-    internal func installOnView(updateExisting: Bool = false, file: String? = nil, line: UInt? = nil) -> [LayoutConstraint] {
+    internal func installOnView(updateExisting updateExisting: Bool = false, file: String? = nil, line: UInt? = nil) -> [LayoutConstraint] {
         var installOnView: View? = nil
         if self.toItem.view != nil {
             installOnView = closestCommonSuperviewFromView(self.fromItem.view, toView: self.toItem.view)
@@ -204,11 +204,7 @@ internal class ConcreteConstraint: Constraint {
             }
         } else {
             
-            let widthAttr = ConstraintAttributes.Width
-            let heightAttr = ConstraintAttributes.Height
-            let sizeAttrs = widthAttr | heightAttr
-            
-            if self.fromItem.attributes == widthAttr || self.fromItem.attributes == heightAttr || self.fromItem.attributes == sizeAttrs {
+            if self.fromItem.attributes.isSubsetOf(ConstraintAttributes.Width.union(.Height)) {
                 installOnView = self.fromItem.view
             } else {
                 installOnView = self.fromItem.view?.superview

Source/ConstraintMaker.swift

@@ -133,7 +133,7 @@ public class ConstraintMaker {
         return constraintDescription
     }
     
-    internal class func prepareConstraints(#view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) -> [Constraint] {
+    internal class func prepareConstraints(view view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) -> [Constraint] {
         let maker = ConstraintMaker(view: view, file: file, line: line)
         closure(make: maker)
         
@@ -145,7 +145,7 @@ public class ConstraintMaker {
         return constraints
     }
     
-    internal class func makeConstraints(#view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) {
+    internal class func makeConstraints(view view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) {
         view.translatesAutoresizingMaskIntoConstraints = false
         let maker = ConstraintMaker(view: view, file: file, line: line)
         closure(make: maker)
@@ -158,7 +158,7 @@ public class ConstraintMaker {
         }
     }
     
-    internal class func remakeConstraints(#view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) {
+    internal class func remakeConstraints(view view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) {
         view.translatesAutoresizingMaskIntoConstraints = false
         let maker = ConstraintMaker(view: view, file: file, line: line)
         closure(make: maker)
@@ -172,7 +172,7 @@ public class ConstraintMaker {
         }
     }
     
-    internal class func updateConstraints(#view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) {
+    internal class func updateConstraints(view view: View, file: String = "Unknown", line: UInt = 0, @noescape closure: (make: ConstraintMaker) -> Void) {
         view.translatesAutoresizingMaskIntoConstraints = false
         let maker = ConstraintMaker(view: view, file: file, line: line)
         closure(make: maker)
@@ -185,7 +185,7 @@ public class ConstraintMaker {
         }
     }
     
-    internal class func removeConstraints(#view: View) {
+    internal class func removeConstraints(view view: View) {
         for existingLayoutConstraint in view.snp_installedLayoutConstraints {
             existingLayoutConstraint.snp_constraint?.uninstall()
         }