fix warnings

xremix · Oct 24, 2017 · a23db81 · a23db81
1 parent ec97fbd
commit a23db81
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/SwiftGS1Barcode/GS1Barcode.swift b/SwiftGS1Barcode/GS1Barcode.swift
@@ -92,7 +92,7 @@ public class GS1Barcode: NSObject, Barcode {
 
     private func parseApplicationIdentifier(_ ai: GS1ApplicationIdentifier, data: inout String)->Bool{
         if(data.startsWith(ai.identifier)){
-            let pai = GS1BarcodeParser.parseGS1ApplicationIdentifier(ai, data: data)
+            _ = GS1BarcodeParser.parseGS1ApplicationIdentifier(ai, data: data)
             //            ai = GS1BarcodeParser.parseGS1ApplicationIdentifier(ai, data: data)
             data =  GS1BarcodeParser.reduce(data: data, by: ai)!
 

diff --git a/SwiftGS1Barcode/StringExtension.swift b/SwiftGS1Barcode/StringExtension.swift
@@ -13,8 +13,7 @@ extension String{
         let start = self.index(self.startIndex, offsetBy: from)
         let end = self.index(start, offsetBy: length)
         let range = start..<end
-
-        return self.substring(with: range)  // play
+        return String(self[range])
     }
     func substring(_ from: Int, to: Int)->String{
         return self.substring(from, length: to-from)
@@ -26,12 +25,7 @@ extension String{
     func substring(to: Int)->String{
         return self.substring(0, length: to)
     }
-    func substring(to: String)->String{
-        if let index =  self.index(of: to){
-            return self.substring(to:index)
-        }
-        return self
-    }
+
     func index(of string: String, options: CompareOptions = .literal) -> Index? {
         return range(of: string, options: options)?.lowerBound
     }

diff --git a/SwiftGS1BarcodeTests/StringTests.swift b/SwiftGS1BarcodeTests/StringTests.swift
@@ -45,11 +45,7 @@ class StringTests: XCTestCase {
         XCTAssertEqual(testString.substring(from: testString.length), "")
         XCTAssertEqual(testString, "Hello World") // Test Integration
     }
-    func testSubstringToString() {
-        XCTAssertEqual(testString.substring(to: "World"), "Hello ")
-        XCTAssertEqual(testString.substring(to: "Hello World"), "")
-        XCTAssertEqual(testString, "Hello World") // Test Integration
-    }
+
     func testStartsWith(){
         XCTAssert(testString.startsWith("Hello"))
         XCTAssert(!testString.startsWith("World"))