Skip to content

Commit 3e417a9

Browse files
committed
Code clean up
1 parent 3ee8f1d commit 3e417a9

File tree

3 files changed

+11
-10
lines changed
  • jsoniter-scala-core

3 files changed

+11
-10
lines changed

jsoniter-scala-core/js/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,15 +1253,14 @@ final class JsonReader private[jsoniter_scala](
12531253
*/
12541254
def isCharBufEqualsTo(len: Int, s: String): Boolean = {
12551255
if (s eq null) throw new NullPointerException
1256-
s.length == len && {
1257-
val charBuf = this.charBuf
1258-
var i = 0
1259-
while (i < len) {
1260-
if (s.charAt(i) != charBuf(i)) return false
1261-
i += 1
1262-
}
1263-
true
1256+
if (s.length != len) return false
1257+
val charBuf = this.charBuf
1258+
var i = 0
1259+
while (i < len) {
1260+
if (s.charAt(i) != charBuf(i)) return false
1261+
i += 1
12641262
}
1263+
true
12651264
}
12661265

12671266
/**

jsoniter-scala-core/jvm/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,8 @@ final class JsonReader private[jsoniter_scala](
12761276
* @param s the string to match
12771277
* @return `true` if the char buffer contains `s`, `false` otherwise
12781278
*/
1279-
def isCharBufEqualsTo(len: Int, s: String): Boolean = s.length == len && {
1279+
def isCharBufEqualsTo(len: Int, s: String): Boolean = {
1280+
if (s.length != len) return false
12801281
val charBuf = this.charBuf
12811282
var i = 0
12821283
while (i < len) {

jsoniter-scala-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,8 @@ final class JsonReader private[jsoniter_scala](
12761276
* @param s the string to match
12771277
* @return `true` if the char buffer contains `s`, `false` otherwise
12781278
*/
1279-
def isCharBufEqualsTo(len: Int, s: String): Boolean = s.length == len && {
1279+
def isCharBufEqualsTo(len: Int, s: String): Boolean = {
1280+
if (s.length != len) return false
12801281
val charBuf = this.charBuf
12811282
var i = 0
12821283
while (i < len) {

0 commit comments

Comments
 (0)