Skip to content

Commit f5fd248

Browse files
cquirozcquiroz
authored
Merge pull request cquiroz#414 from scala-steward/update/scalafmt-core-3.6.1
2 parents 00663a7 + fb78e14 commit f5fd248

File tree

10 files changed

+41
-39
lines changed

10 files changed

+41
-39
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.6.1
2+
aa7db3a42121f78a5b3bed3658786c1cef83efe8

‎.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.5.9"
1+
version = "3.6.1"
22
style = default
33

44
maxColumn = 100

‎core/js/src/main/scala/java/util/SimpleTimeZone.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package java.util
22

33
class SimpleTimeZone(rawOffset: Int, var ID: String) extends TimeZone {
4-
override def getRawOffset = rawOffset
4+
override def getRawOffset = rawOffset
55
/* concrete methods */
6-
override def getID: String = ID
6+
override def getID: String = ID
77
override def setID(id: String): Unit = ID = id
88

99
}

‎core/js/src/main/scala/java/util/TimeZone.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ object TimeZone {
5151
new SimpleTimeZone(offsetInMillis, timeZone)
5252
}
5353

54-
def getDefault: TimeZone = default
54+
def getDefault: TimeZone = default
5555
def setDefault(timeZone: TimeZone): Unit = default = timeZone
5656

5757
def getTimeZone(timeZone: String): TimeZone = getTimeZone(ZoneId.of(timeZone))
58-
def getTimeZone(zoneId: ZoneId): TimeZone = {
58+
def getTimeZone(zoneId: ZoneId): TimeZone = {
5959
val rules = zoneId.getRules
6060
val offsetInMillis = rules.getStandardOffset(Instant.now).getTotalSeconds * 1000
6161
new SimpleTimeZone(offsetInMillis, zoneId.getId)
@@ -80,7 +80,7 @@ abstract class TimeZone extends Serializable with Cloneable {
8080
// def useDaylightTime: Boolean
8181

8282
/* concrete methods */
83-
def getID: String = ID
83+
def getID: String = ID
8484
def setID(id: String): Unit = ID = id
8585

8686
def getDisplayName(daylight: Boolean, style: Int, locale: Locale): String = {

‎core/native/src/main/scala/java/util/SimpleTimeZone.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package java.util
22

33
class SimpleTimeZone(rawOffset: Int, var ID: String) extends TimeZone {
4-
override def getRawOffset = rawOffset
4+
override def getRawOffset = rawOffset
55
/* concrete methods */
6-
override def getID: String = ID
6+
override def getID: String = ID
77
override def setID(id: String): Unit = ID = id
88

99
}

‎core/native/src/main/scala/java/util/TimeZone.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ object TimeZone {
1313
// TODO: implement this functionality, perhaps using https://github.com/scala-native/scala-native/blob/master/posixlib/src/main/scala/scala/scalanative/posix/time.scala
1414
new SimpleTimeZone(0, "UTC")
1515

16-
def getDefault: TimeZone = default
16+
def getDefault: TimeZone = default
1717
def setDefault(timeZone: TimeZone): Unit = default = timeZone
1818

1919
def getTimeZone(timeZone: String): TimeZone = getTimeZone(ZoneId.of(timeZone))
20-
def getTimeZone(zoneId: ZoneId): TimeZone = {
20+
def getTimeZone(zoneId: ZoneId): TimeZone = {
2121
val rules = zoneId.getRules
2222
val offsetInMillis = rules.getStandardOffset(Instant.now).getTotalSeconds * 1000
2323
new SimpleTimeZone(offsetInMillis, zoneId.getId)
@@ -42,7 +42,7 @@ abstract class TimeZone extends Serializable with Cloneable {
4242
// def useDaylightTime: Boolean
4343

4444
/* concrete methods */
45-
def getID: String = ID
45+
def getID: String = ID
4646
def setID(id: String): Unit = ID = id
4747

4848
def getDisplayName(daylight: Boolean, style: Int, locale: Locale): String = {

‎core/shared/src/main/scala-2/org/threeten/bp/temporal/IsoFields.scala‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ object IsoFields {
259259
private def QY = "QuarterOfYear"
260260

261261
lazy val QUARTER_OF_YEAR: Field = new Field("QUARTER_OF_YEAR", 1) {
262-
override def toString: String = QY
263-
def getBaseUnit: TemporalUnit = QUARTER_YEARS
264-
def getRangeUnit: TemporalUnit = YEARS
265-
def range: ValueRange = ValueRange.of(1, 4)
266-
def isSupportedBy(temporal: TemporalAccessor): Boolean =
262+
override def toString: String = QY
263+
def getBaseUnit: TemporalUnit = QUARTER_YEARS
264+
def getRangeUnit: TemporalUnit = YEARS
265+
def range: ValueRange = ValueRange.of(1, 4)
266+
def isSupportedBy(temporal: TemporalAccessor): Boolean =
267267
temporal.isSupported(MONTH_OF_YEAR) && isIso(temporal)
268-
def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = range
268+
def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = range
269269
def getFrom(temporal: TemporalAccessor): Long = {
270270
if (!temporal.isSupported(this))
271271
throw unsupportedEx(QY)
@@ -349,13 +349,13 @@ object IsoFields {
349349
new UnsupportedTemporalTypeException(s"Unsupported field: $f")
350350

351351
lazy val WEEK_BASED_YEAR: Field = new Field("WEEK_BASED_YEAR", 3) {
352-
override def toString: String = WBY
353-
def getBaseUnit: TemporalUnit = WEEK_BASED_YEARS
354-
def getRangeUnit: TemporalUnit = FOREVER
355-
def range: ValueRange = YEAR.range
356-
def isSupportedBy(temporal: TemporalAccessor): Boolean =
352+
override def toString: String = WBY
353+
def getBaseUnit: TemporalUnit = WEEK_BASED_YEARS
354+
def getRangeUnit: TemporalUnit = FOREVER
355+
def range: ValueRange = YEAR.range
356+
def isSupportedBy(temporal: TemporalAccessor): Boolean =
357357
temporal.isSupported(EPOCH_DAY) && isIso(temporal)
358-
def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = YEAR.range
358+
def rangeRefinedBy(temporal: TemporalAccessor): ValueRange = YEAR.range
359359
def getFrom(temporal: TemporalAccessor): Long =
360360
if (!temporal.isSupported(this))
361361
throw unsupportedEx(WBY)

‎core/shared/src/main/scala/org/threeten/bp/ZoneId.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ abstract class ZoneId private[bp] () extends Serializable {
407407
.appendZoneText(style)
408408
.toFormatter(locale)
409409
.format(new TemporalAccessor() {
410-
def isSupported(field: TemporalField): Boolean = false
410+
def isSupported(field: TemporalField): Boolean = false
411411
def getLong(field: TemporalField): Long =
412412
throw new UnsupportedTemporalTypeException(s"Unsupported field: $field")
413413
override def query[R](query: TemporalQuery[R]): R =

‎tests/shared/src/test/scala-2/org/threeten/bp/temporal/MockFieldNoValue.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ object MockFieldNoValue {
4545
final class MockFieldNoValue(name: String, ordinal: Int)
4646
extends Enum[MockFieldNoValue](name, ordinal)
4747
with TemporalField {
48-
override def toString: String = null
49-
def getBaseUnit: TemporalUnit = WEEKS
50-
def getRangeUnit: TemporalUnit = MONTHS
51-
def range: ValueRange = ValueRange.of(1, 20)
52-
def isDateBased: Boolean = true
53-
def isTimeBased: Boolean = false
54-
def isSupportedBy(dateTime: TemporalAccessor): Boolean = true
55-
def rangeRefinedBy(dateTime: TemporalAccessor): ValueRange = ValueRange.of(1, 20)
56-
def getFrom(dateTime: TemporalAccessor): Long = throw new DateTimeException("Mock")
48+
override def toString: String = null
49+
def getBaseUnit: TemporalUnit = WEEKS
50+
def getRangeUnit: TemporalUnit = MONTHS
51+
def range: ValueRange = ValueRange.of(1, 20)
52+
def isDateBased: Boolean = true
53+
def isTimeBased: Boolean = false
54+
def isSupportedBy(dateTime: TemporalAccessor): Boolean = true
55+
def rangeRefinedBy(dateTime: TemporalAccessor): ValueRange = ValueRange.of(1, 20)
56+
def getFrom(dateTime: TemporalAccessor): Long = throw new DateTimeException("Mock")
5757
def adjustInto[R <: Temporal](dateTime: R, newValue: Long): R =
5858
throw new DateTimeException("Mock")
59-
override def getDisplayName(locale: Locale): String = "Mock"
59+
override def getDisplayName(locale: Locale): String = "Mock"
6060
override def resolve(
6161
fieldValues: java.util.Map[TemporalField, java.lang.Long],
6262
partialTemporal: TemporalAccessor,

‎tests/shared/src/test/scala/org/threeten/bp/format/GenTestPrinterParser.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ import org.threeten.bp.format.internal.TTBPDateTimePrintContext
4848
/** Abstract PrinterParser test. */
4949
object GenTestPrinterParser {
5050
private val EMPTY: TemporalAccessor = new TemporalAccessor() {
51-
def isSupported(field: TemporalField): Boolean = true
52-
def getLong(field: TemporalField): Long = throw new DateTimeException("Mock")
53-
override def get(field: TemporalField): Int =
51+
def isSupported(field: TemporalField): Boolean = true
52+
def getLong(field: TemporalField): Long = throw new DateTimeException("Mock")
53+
override def get(field: TemporalField): Int =
5454
range(field).checkValidIntValue(getLong(field), field)
55-
override def query[R](query: TemporalQuery[R]): R = query.queryFrom(this)
56-
override def range(field: TemporalField): ValueRange = field.range
55+
override def query[R](query: TemporalQuery[R]): R = query.queryFrom(this)
56+
override def range(field: TemporalField): ValueRange = field.range
5757
}
5858
}
5959

0 commit comments

Comments
 (0)