diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 36a2bcae..fc885d56 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -9,3 +9,6 @@ cc4f48597d3151542ecec3c159159e1793926314 # Scala Steward: Reformat with scalafmt 3.8.1 084144fd6e2c78ee7e3763eace52e9185007175c + +# Scala Steward: Reformat with scalafmt 3.8.2 +60f546bd54981b54826a07f290b287cd105d6a9a diff --git a/.scalafmt.conf b/.scalafmt.conf index bc9a8248..7cb3ae59 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ runner.dialect = scala3 -version = 3.8.1 +version = 3.8.2 maxColumn = 120 \ No newline at end of file diff --git a/core/src/main/scala/sttp/model/internal/Rfc3986.scala b/core/src/main/scala/sttp/model/internal/Rfc3986.scala index 5cb08a6f..c72cdbb9 100644 --- a/core/src/main/scala/sttp/model/internal/Rfc3986.scala +++ b/core/src/main/scala/sttp/model/internal/Rfc3986.scala @@ -26,15 +26,14 @@ object Rfc3986 { ): String = encode(s, "UTF-8", allowedCharacters, spaceAsPlus, encodePlus) - /** Encode string using encoding, leave allowedCharacters as they are - * @param s - * String to be encoded - * @param enc - * Encoding to be used - * @param allowedCharacters - * Characters to be not to be encoded - */ + * @param s + * String to be encoded + * @param enc + * Encoding to be used + * @param allowedCharacters + * Characters to be not to be encoded + */ def encode(s: String, enc: String, allowedCharacters: Set[Char]): String = encode(s, enc, allowedCharacters, spaceAsPlus = false, encodePlus = false) diff --git a/core/src/main/scalanative-3/sttp/model/internal/idn/IdnApi.scala b/core/src/main/scalanative-3/sttp/model/internal/idn/IdnApi.scala index d1db1836..6ba1e93c 100644 --- a/core/src/main/scalanative-3/sttp/model/internal/idn/IdnApi.scala +++ b/core/src/main/scalanative-3/sttp/model/internal/idn/IdnApi.scala @@ -5,7 +5,7 @@ import scala.scalanative.unsafe.{CString, Ptr, Zone, fromCString, sizeof, toCStr private[model] object IdnApi { def toAscii(input: String): String = - Zone { + Zone { val output: Ptr[CString] = malloc(sizeof[CString]).asInstanceOf[Ptr[CString]] val rc = CIdn.toAscii(toCString(input), output, 0) if (rc != 0) { diff --git a/core/src/test/scala/sttp/model/UriTests.scala b/core/src/test/scala/sttp/model/UriTests.scala index 24bc91f7..ca2b22d9 100644 --- a/core/src/test/scala/sttp/model/UriTests.scala +++ b/core/src/test/scala/sttp/model/UriTests.scala @@ -139,7 +139,7 @@ class UriTests extends AnyFunSuite with Matchers with TryValues with UriTestsExt "v1-v2" -> "v1-v2", "v1~v2" -> "v1~v2", "v1_v2" -> "v1_v2", - "v1.v2" -> "v1.v2", + "v1.v2" -> "v1.v2" ) for { diff --git a/core/src/test/scalanative/sttp/model/UriTestsExtension.scala b/core/src/test/scalanative/sttp/model/UriTestsExtension.scala index 5b8c6090..078b139e 100644 --- a/core/src/test/scalanative/sttp/model/UriTestsExtension.scala +++ b/core/src/test/scalanative/sttp/model/UriTestsExtension.scala @@ -5,4 +5,4 @@ import org.scalatest.funsuite.AnyFunSuite import org.scalatest.matchers.should.Matchers import sttp.model.Uri._ -trait UriTestsExtension \ No newline at end of file +trait UriTestsExtension