Make messageType non-optional since in practice it is always available

tbkka · tbkka · commit 4feb5dc5eaba · 2020-06-03T14:07:34.000-07:00
diff --git a/Sources/SwiftProtobuf/JSONDecoder.swift b/Sources/SwiftProtobuf/JSONDecoder.swift
@@ -18,7 +18,7 @@ internal struct JSONDecoder: Decoder {
   internal var scanner: JSONScanner
   internal var options: JSONDecodingOptions
   internal var extensions: ExtensionMap
-  internal var messageType: Message.Type?
+  internal var messageType: Message.Type
   private var fieldCount = 0
   private var isMapKey = false
   private var fieldNameMap: _NameMap?
diff --git a/Sources/SwiftProtobuf/JSONScanner.swift b/Sources/SwiftProtobuf/JSONScanner.swift
@@ -1253,7 +1253,7 @@ internal struct JSONScanner {
   /// it silently skips it.
   internal mutating func nextFieldNumber(
     names: _NameMap,
-    messageType: Message.Type?,
+    messageType: Message.Type,
     extensionMap: ExtensionMap?
   ) throws -> Int? {
     while true {
@@ -1274,7 +1274,6 @@ internal struct JSONScanner {
         }
       }
       if let extensions = extensionMap,
-         let messageType = messageType,
          let first = fieldName.first, first == "[",
          let last = fieldName.last, last == "]"
       {

Original file line number	Diff line number	Diff line change
`@@ -1253,7 +1253,7 @@ internal struct JSONScanner {`
`1253`	`1253`	`/// it silently skips it.`
`1254`	`1254`	`internal mutating func nextFieldNumber(`
`1255`	`1255`	`names: _NameMap,`
`1256`		`- messageType: Message.Type?,`
	`1256`	`+ messageType: Message.Type,`
`1257`	`1257`	`extensionMap: ExtensionMap?`
`1258`	`1258`	`) throws -> Int? {`
`1259`	`1259`	`while true {`
`@@ -1274,7 +1274,6 @@ internal struct JSONScanner {`
`1274`	`1274`	`}`
`1275`	`1275`	`}`
`1276`	`1276`	`if let extensions = extensionMap,`
`1277`		`- let messageType = messageType,`
`1278`	`1277`	`let first = fieldName.first, first == "[",`
`1279`	`1278`	`let last = fieldName.last, last == "]"`
`1280`	`1279`	`{`