Skip to content

Commit 9d3aacb

Browse files
authored
scalajs updated to 1.13.0 (#1896)
1 parent 3e74427 commit 9d3aacb

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

distage/distage-core/src/main/scala/izumi/distage/planning/AutoSetHook.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import izumi.reflect.Tag
4848
* }
4949
* }}}
5050
*/
51-
final case class AutoSetHook[BINDING: Tag] (includeOnly: InclusionPredicate, name: Option[Identifier], weak: Boolean, pos: CodePosition) extends PlanningHook {
51+
final case class AutoSetHook[BINDING: Tag](includeOnly: InclusionPredicate, name: Option[Identifier], weak: Boolean, pos: CodePosition) extends PlanningHook {
5252
protected val setElementType: SafeType = SafeType.get[BINDING]
5353

5454
protected val setKey: DIKey = name match {
@@ -95,7 +95,7 @@ final case class AutoSetHook[BINDING: Tag] (includeOnly: InclusionPredicate, nam
9595
private def findMatchingBindings(definition: ModuleBase): Set[ImplBinding] = {
9696
definition.bindings
9797
.filter {
98-
case sb: Binding.SingletonBinding[_] if sb.isMutator => false
98+
case sb: Binding.SingletonBinding[?] if sb.isMutator => false
9999
case _ => true
100100
}
101101
.flatMap {

logstage/logstage-core/src/main/scala/izumi/logstage/api/rendering/LogstageCodec.scala

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,16 @@ sealed trait LogstageCodecLowPriority {
6767

6868
implicit final lazy val LogstageCodecThrowable: LogstageCodec[Throwable] = {
6969
(w, t) =>
70-
w.openMap()
71-
w.writeMapElement("type", Some(t.getClass.getName))
72-
w.writeMapElement("message", Option(t.getMessage))
73-
w.writeMapElement("stacktrace", Some(t.stackTrace))
74-
w.closeMap()
70+
Option(t) match {
71+
case Some(_) =>
72+
w.openMap()
73+
w.writeMapElement("type", Option(t.getClass).map(_.getName))
74+
w.writeMapElement("message", Option(t.getMessage))
75+
w.writeMapElement("stacktrace", Option(t.stackTrace))
76+
w.closeMap()
77+
case None =>
78+
w.writeNull()
79+
}
7580
}
7681

7782
}

0 commit comments

Comments
 (0)