From c10dde8488143d087d50a986334d38f782da72a2 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 25 Sep 2021 18:44:50 +0200 Subject: [PATCH 1/2] Update scalafmt-core to 3.0.5 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index f86b42b1..4fc3c0f7 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.0.4" +version = "3.0.5" style = defaultWithAlign maxColumn = 120 align.openParenDefnSite = true From 7284e891f9fb4fe039c1fa00a6445ade3676e254 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 25 Sep 2021 18:45:04 +0200 Subject: [PATCH 2/2] Reformat with scalafmt 3.0.5 --- .../io/scalajs/nodejs/fs/FsV8AsyncTest.scala | 6 +++--- .../io/scalajs/nodejs/buffer/Buffer.scala | 2 +- .../nodejs/child_process/ChildProcess.scala | 2 +- .../io/scalajs/nodejs/crypto/Crypto.scala | 4 ++-- .../scalajs/nodejs/dns/PromisesResolver.scala | 18 +++++++++--------- .../scala/io/scalajs/nodejs/events/Event.scala | 4 ++-- .../main/scala/io/scalajs/nodejs/fs/Fs.scala | 6 +++--- .../nodejs/http2/Http2ServerResponse.scala | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala index d7394d4b..df4f59df 100644 --- a/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala +++ b/app/nodejs-v10/src/test/scala/io/scalajs/nodejs/fs/FsV8AsyncTest.scala @@ -86,9 +86,9 @@ class FsV8AsyncTest extends AsyncFunSpec with BeforeAndAfterEach { it("should support copyFileFuture") { for { - _ <- Fs.appendFileFuture("x.CopyFile.txt", "yay") - _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") - _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") // succeed + _ <- Fs.appendFileFuture("x.CopyFile.txt", "yay") + _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") + _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt") // succeed _ <- Fs.copyFileFuture("x.CopyFile.txt", "x.CopyFile_2.txt", Fs.constants.COPYFILE_EXCL).failed stat <- Fs.statFuture("x.CopyFile_2.txt") _ <- Fs.unlinkFuture("x.CopyFile.txt") diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/buffer/Buffer.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/buffer/Buffer.scala index c0048f95..f9588065 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/buffer/Buffer.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/buffer/Buffer.scala @@ -975,7 +975,7 @@ class Buffer protected () extends Uint8Array( /* dummy to trick constructor */ - */ @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12) def readBigInt64BE( offset: Int - ): scalajs.js.BigInt = js.native + ): scalajs.js.BigInt = js.native @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12) def readBigInt64BE(): scalajs.js.BigInt = js.native /** @see diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala index 4446c4b4..0234f109 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/child_process/ChildProcess.scala @@ -38,7 +38,7 @@ trait ForkedChildProcess extends ChildProcess { sendHandle: Handle, options: SendOptions, callback: js.Function1[nodejs.Error, Any] - ): Boolean = js.native + ): Boolean = js.native def send(message: js.Any, sendHandle: Handle, options: SendOptions): Boolean = js.native def send(message: js.Any, sendHandle: Handle, callback: js.Function1[nodejs.Error, Any]): Boolean = js.native def send(message: js.Any, sendHandle: Handle): Boolean = js.native diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala index a0d2f5f7..ac58bcf8 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala @@ -108,7 +108,7 @@ trait Crypto extends js.Object { primeEncoding: String, generator: String, generatorEncoding: String - ): DiffieHellman = js.native + ): DiffieHellman = js.native def createDiffieHellman(prime: BufferLike, generator: String, generatorEncoding: String): DiffieHellman = js.native def createDiffieHellman(prime: BufferLike, generator: Int): DiffieHellman = js.native def createDiffieHellman(prime: BufferLike, generator: BufferLike): DiffieHellman = js.native @@ -376,7 +376,7 @@ trait Crypto extends js.Object { keylen: Int, options: ScryptOptions, callback: Callback1[Buffer] - ): Unit = js.native + ): Unit = js.native def scrypt(password: String, salt: String, keylen: Int, callback: Callback1[Buffer]): Unit = js.native def scrypt(password: String, salt: BufferLike, keylen: Int, callback: Callback1[Buffer]): Unit = js.native def scrypt(password: BufferLike, salt: String, keylen: Int, callback: Callback1[Buffer]): Unit = js.native diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala index 818e6deb..73026ca2 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/dns/PromisesResolver.scala @@ -20,13 +20,13 @@ class PromisesResolver extends js.Object { def resolveAny(hostname: String): js.Promise[js.Array[ResolveObject]] = js.native @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs14) def resolveCaa(hostname: String): js.Promise[js.Array[ResolveObject]] = js.native - def resolveCname(hostname: String): js.Promise[js.Array[String]] = js.native - def resolveMx(hostname: String): js.Promise[js.Array[MX]] = js.native - def resolveNaptr(hostname: String): js.Promise[js.Array[NAPTR]] = js.native - def resolveNs(hostname: String): js.Promise[js.Array[String]] = js.native - def resolveSoa(hostname: String): js.Promise[js.Array[SOA]] = js.native - def resolveSrv(hostname: String): js.Promise[js.Array[SRV]] = js.native - def resolvePtr(hostname: String): js.Promise[js.Array[String]] = js.native - def resolveTxt(hostname: String): js.Promise[js.Array[String]] = js.native - def reverse(ipAddress: String): js.Promise[js.Array[String]] = js.native + def resolveCname(hostname: String): js.Promise[js.Array[String]] = js.native + def resolveMx(hostname: String): js.Promise[js.Array[MX]] = js.native + def resolveNaptr(hostname: String): js.Promise[js.Array[NAPTR]] = js.native + def resolveNs(hostname: String): js.Promise[js.Array[String]] = js.native + def resolveSoa(hostname: String): js.Promise[js.Array[SOA]] = js.native + def resolveSrv(hostname: String): js.Promise[js.Array[SRV]] = js.native + def resolvePtr(hostname: String): js.Promise[js.Array[String]] = js.native + def resolveTxt(hostname: String): js.Promise[js.Array[String]] = js.native + def reverse(ipAddress: String): js.Promise[js.Array[String]] = js.native } diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala index 381b9e9c..763e8060 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/events/Event.scala @@ -18,13 +18,13 @@ trait Event extends js.Object { def stopPropagation(): Unit = js.native @deprecated("Use stopPropagation", "legacy") - def cancelBubble: Boolean = js.native + def cancelBubble: Boolean = js.native def stopImmediatePropagation(): Unit = js.native def bubbles: Boolean = js.native def cancelable: Boolean = js.native @deprecated("Use returnValue", "legacy") - def returnValue: Boolean = js.native + def returnValue: Boolean = js.native def preventDefault(): Unit = js.native def defaultPrevented: Boolean = js.native def composed: Boolean = js.native diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/fs/Fs.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/fs/Fs.scala index ca4f272e..9cfb22ab 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/fs/Fs.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/fs/Fs.scala @@ -718,7 +718,7 @@ trait Fs extends js.Object { offset: Int | Null, length: Int | Null, position: Int | Null - ): Unit = js.native + ): Unit = js.native def readSync(fd: FileDescriptor, buffer: BufferLike, offset: Int | Null): Unit = js.native def readSync(fd: FileDescriptor, buffer: BufferLike): Unit = js.native @@ -1237,7 +1237,7 @@ trait Fs extends js.Object { position: Int, encoding: String, callback: FsCallback2[Int, String] - ): Unit = js.native + ): Unit = js.native def write(fd: FileDescriptor, string: String, position: Int, callback: FsCallback2[Int, String]): Unit = js.native def write(fd: FileDescriptor, string: String, callback: FsCallback2[Int, String]): Unit = js.native @@ -1494,7 +1494,7 @@ object Fs extends Fs { offset: Int | Null, length: Int | Null, position: Int | Null - ): js.Promise[BufferIOResult[js.typedarray.DataView]] = js.native + ): js.Promise[BufferIOResult[js.typedarray.DataView]] = js.native def write(string: String, position: Int | Null, encoding: String): js.Promise[BufferIOResult[String]] = js.native def writeFile(data: String, options: FileWriteOptions): js.Promise[Unit] = js.native diff --git a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala index 93ca71c2..2c503b16 100644 --- a/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala +++ b/app/nodejs-v16/src/main/scala/io/scalajs/nodejs/http2/Http2ServerResponse.scala @@ -14,8 +14,8 @@ class Http2ServerResponse extends stream.Writable with Http2TimeoutOps { @deprecated("Use response.socket", "Node.js v13.0.0") def connection: net.Socket | tls.TLSSocket = js.native - def socket: net.Socket | tls.TLSSocket = js.native - def stream: Http2Stream = js.native + def socket: net.Socket | tls.TLSSocket = js.native + def stream: Http2Stream = js.native @enableIf(io.scalajs.nodejs.internal.CompilerSwitches.ltNodeJs16) def req: Http2ServerRequest = js.native @@ -40,7 +40,7 @@ class Http2ServerResponse extends stream.Writable with Http2TimeoutOps { def setHeader(name: String, value: js.Array[String]): Unit = js.native @deprecated("Use writableEnd", "Node.js v13.4.0, v12.16.0") - def finished: Boolean = js.native + def finished: Boolean = js.native def headersSent: Boolean = js.native def sendDate: Boolean = js.native