Skip to content

Commit 25779fa

Browse files
jberkeljberkel
committed
Fix compiler warnings
- objc inference - substring(to:) deprecation - redundant conformance constraint
1 parent 6463eb1 commit 25779fa

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@
988988
SKIP_INSTALL = YES;
989989
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
990990
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
991-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
991+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
992992
SWIFT_VERSION = 4.0;
993993
TVOS_DEPLOYMENT_TARGET = 9.1;
994994
};
@@ -1012,7 +1012,7 @@
10121012
SKIP_INSTALL = YES;
10131013
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
10141014
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
1015-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1015+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
10161016
SWIFT_VERSION = 4.0;
10171017
TVOS_DEPLOYMENT_TARGET = 9.1;
10181018
};
@@ -1026,7 +1026,7 @@
10261026
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10271027
PRODUCT_NAME = "$(TARGET_NAME)";
10281028
SDKROOT = appletvos;
1029-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1029+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
10301030
SWIFT_VERSION = 4.0;
10311031
TVOS_DEPLOYMENT_TARGET = 9.1;
10321032
};
@@ -1040,7 +1040,7 @@
10401040
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
10411041
PRODUCT_NAME = "$(TARGET_NAME)";
10421042
SDKROOT = appletvos;
1043-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1043+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
10441044
SWIFT_VERSION = 4.0;
10451045
TVOS_DEPLOYMENT_TARGET = 9.1;
10461046
};
@@ -1065,7 +1065,7 @@
10651065
SKIP_INSTALL = YES;
10661066
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
10671067
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
1068-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1068+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
10691069
SWIFT_VERSION = 4.0;
10701070
TARGETED_DEVICE_FAMILY = 4;
10711071
WATCHOS_DEPLOYMENT_TARGET = 2.2;
@@ -1091,7 +1091,7 @@
10911091
SKIP_INSTALL = YES;
10921092
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
10931093
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
1094-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1094+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
10951095
SWIFT_VERSION = 4.0;
10961096
TARGETED_DEVICE_FAMILY = 4;
10971097
WATCHOS_DEPLOYMENT_TARGET = 2.2;
@@ -1230,7 +1230,7 @@
12301230
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
12311231
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
12321232
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1233-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1233+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
12341234
SWIFT_VERSION = 4.0;
12351235
};
12361236
name = Debug;
@@ -1256,7 +1256,7 @@
12561256
"SWIFT_INCLUDE_PATHS[sdk=iphoneos10.0]" = "$(SRCROOT)/CocoaPods/iphoneos-10.0";
12571257
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator*]" = "$(SRCROOT)/CocoaPods/iphonesimulator";
12581258
"SWIFT_INCLUDE_PATHS[sdk=iphonesimulator10.0]" = "$(SRCROOT)/CocoaPods/iphonesimulator-10.0";
1259-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1259+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
12601260
SWIFT_VERSION = 4.0;
12611261
};
12621262
name = Release;
@@ -1269,7 +1269,7 @@
12691269
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12701270
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12711271
PRODUCT_NAME = "$(TARGET_NAME)";
1272-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1272+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
12731273
SWIFT_VERSION = 4.0;
12741274
};
12751275
name = Debug;
@@ -1282,7 +1282,7 @@
12821282
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12831283
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
12841284
PRODUCT_NAME = "$(TARGET_NAME)";
1285-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1285+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
12861286
SWIFT_VERSION = 4.0;
12871287
};
12881288
name = Release;
@@ -1310,7 +1310,7 @@
13101310
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
13111311
"SWIFT_INCLUDE_PATHS[sdk=macosx10.11]" = "$(SRCROOT)/CocoaPods/macosx-10.11";
13121312
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1313-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1313+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13141314
SWIFT_VERSION = 4.0;
13151315
};
13161316
name = Debug;
@@ -1338,7 +1338,7 @@
13381338
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
13391339
"SWIFT_INCLUDE_PATHS[sdk=macosx10.11]" = "$(SRCROOT)/CocoaPods/macosx-10.11";
13401340
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1341-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1341+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13421342
SWIFT_VERSION = 4.0;
13431343
};
13441344
name = Release;
@@ -1354,7 +1354,7 @@
13541354
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13551355
PRODUCT_NAME = "$(TARGET_NAME)";
13561356
SDKROOT = macosx;
1357-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1357+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13581358
SWIFT_VERSION = 4.0;
13591359
};
13601360
name = Debug;
@@ -1370,7 +1370,7 @@
13701370
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
13711371
PRODUCT_NAME = "$(TARGET_NAME)";
13721372
SDKROOT = macosx;
1373-
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1373+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13741374
SWIFT_VERSION = 4.0;
13751375
};
13761376
name = Release;

‎Sources/SQLite/Extensions/FTS4.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,18 @@ extension Connection {
151151

152152
guard let (token, range) = next(string) else { return nil }
153153

154-
let view = string.utf8
155-
offset.pointee += Int32(string.substring(to: range.lowerBound).utf8.count)
156-
length.pointee = Int32(view.distance(from: range.lowerBound.samePosition(in: view), to: range.upperBound.samePosition(in: view)))
157-
return token
154+
let view:String.UTF8View = string.utf8
155+
156+
if let from = range.lowerBound.samePosition(in: view),
157+
let to = range.upperBound.samePosition(in: view) {
158+
offset.pointee += Int32(string[string.startIndex..<range.lowerBound].utf8.count)
159+
length.pointee = Int32(view.distance(from: from, to: to))
160+
return token
161+
} else {
162+
return nil
163+
}
158164
})
159165
}
160-
161166
}
162167

163168
/// Configuration options shared between the [FTS4](https://www.sqlite.org/fts3.html) and

‎Sources/SQLite/Typed/Operators.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,10 +474,10 @@ public func <=<V : Value>(lhs: V, rhs: Expression<V?>) -> Expression<Bool?> wher
474474
return infix(lhs, rhs)
475475
}
476476

477-
public func ~=<V : Value>(lhs: ClosedRange<V>, rhs: Expression<V>) -> Expression<Bool> where V.Datatype : Binding & Comparable {
477+
public func ~=<V : Value>(lhs: ClosedRange<V>, rhs: Expression<V>) -> Expression<Bool> where V.Datatype : Comparable {
478478
return Expression("\(rhs.template) BETWEEN ? AND ?", rhs.bindings + [lhs.lowerBound as? Binding, lhs.upperBound as? Binding])
479479
}
480-
public func ~=<V : Value>(lhs: ClosedRange<V>, rhs: Expression<V?>) -> Expression<Bool?> where V.Datatype : Binding & Comparable {
480+
public func ~=<V : Value>(lhs: ClosedRange<V>, rhs: Expression<V?>) -> Expression<Bool?> where V.Datatype : Comparable {
481481
return Expression("\(rhs.template) BETWEEN ? AND ?", rhs.bindings + [lhs.lowerBound as? Binding, lhs.upperBound as? Binding])
482482
}
483483

0 commit comments

Comments
 (0)