From f2e788ac953605f6fdf6ae6c389c57516583825b Mon Sep 17 00:00:00 2001 From: scala-steward Date: Thu, 29 Feb 2024 00:17:36 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.0 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index e1fd888e..553fb677 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = scala3 -version = 3.7.17 +version = 3.8.0 maxColumn = 120 \ No newline at end of file From 18a35197313ed7988f4d22b9e9180d1fb99d499b Mon Sep 17 00:00:00 2001 From: scala-steward Date: Thu, 29 Feb 2024 00:17:42 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.0 Executed command: scalafmt --non-interactive --- core/src/main/scala/sttp/model/UriInterpolator.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/sttp/model/UriInterpolator.scala b/core/src/main/scala/sttp/model/UriInterpolator.scala index 0481e494..d49eb9c2 100644 --- a/core/src/main/scala/sttp/model/UriInterpolator.scala +++ b/core/src/main/scala/sttp/model/UriInterpolator.scala @@ -398,8 +398,7 @@ object UriInterpolator { def doSplit(s: String): Unit = { split(s, sep, escape) match { case Left(x) => - acc += StringToken(x) - () + acc += StringToken(x)() case Right((before, separator, after)) => acc += StringToken(before) acc += StringToken(separator.toString()) @@ -467,8 +466,7 @@ object UriInterpolator { split(t, SchemeEnd) match { case Left(_) => (u, t) case Right((schemeTokens, _, otherTokens)) => - val scheme = tokensToString(schemeTokens) - (u.scheme(scheme), otherTokens) + val scheme = tokensToString(schemeTokens)(u.scheme(scheme), otherTokens) } } } From 6b596162a26ec0de478594abf6b3daf697c02f38 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Thu, 29 Feb 2024 00:17:42 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.0' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 6a690571..8b755594 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,6 @@ f7dccf8d205c1d4f9bd5dbbf9680a6b9d175b444 # Scala Steward: Reformat with scalafmt 3.7.17 cc4f48597d3151542ecec3c159159e1793926314 + +# Scala Steward: Reformat with scalafmt 3.8.0 +18a35197313ed7988f4d22b9e9180d1fb99d499b