Merge branch 'main' into negation_matcher

Quick · Aug 8, 2024 · 4565028 · 4565028
2 parents 477d5ac + 6ba9e68
commit 4565028
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -97,14 +97,16 @@ GEM
     open4 (1.3.4)
     public_suffix (4.0.7)
     redcarpet (3.6.0)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (4.2.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     sqlite3 (1.6.9)
       mini_portile2 (~> 2.8.0)
+    strscan (3.1.0)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)

diff --git a/Sources/Nimble/Matchers/BeLogical.swift b/Sources/Nimble/Matchers/BeLogical.swift
@@ -1,42 +1,42 @@
 import Foundation
 
-extension Int8: ExpressibleByBooleanLiteral {
+extension Int8: Swift.ExpressibleByBooleanLiteral {
     public init(booleanLiteral value: Bool) {
         self = NSNumber(value: value).int8Value
     }
 }
 
-extension UInt8: ExpressibleByBooleanLiteral {
+extension UInt8: Swift.ExpressibleByBooleanLiteral {
     public init(booleanLiteral value: Bool) {
         self = NSNumber(value: value).uint8Value
     }
 }
 
-extension Int16: ExpressibleByBooleanLiteral {
+extension Int16: Swift.ExpressibleByBooleanLiteral {
     public init(booleanLiteral value: Bool) {
         self = NSNumber(value: value).int16Value
     }
 }
 
-extension UInt16: ExpressibleByBooleanLiteral {
+extension UInt16: Swift.ExpressibleByBooleanLiteral {
     public init(booleanLiteral value: Bool) {
         self = NSNumber(value: value).uint16Value
     }
 }
 
-extension Int32: ExpressibleByBooleanLiteral {
+extension Int32: Swift.ExpressibleByBooleanLiteral {
     public init(booleanLiteral value: Bool) {
         self = NSNumber(value: value).int32Value
     }
 }
 
-extension UInt32: ExpressibleByBooleanLiteral {
+extension UInt32: Swift.ExpressibleByBooleanLiteral {
     public init(booleanLiteral value: Bool) {
         self = NSNumber(value: value).uint32Value
     }
 }
 
-extension Int64: ExpressibleByBooleanLiteral {
+extension Int64: Swift.ExpressibleByBooleanLiteral {
     public init(booleanLiteral value: Bool) {
         self = NSNumber(value: value).int64Value
     }