From f66aea7df226c4c0f0d469346262fb2fd75170e7 Mon Sep 17 00:00:00 2001 From: Luis Osa Date: Sun, 24 Sep 2023 21:03:41 +0200 Subject: [PATCH 1/2] Update Traits.scala Refine the wording about "with" and "extends" --- src/main/scala/stdlib/Traits.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/stdlib/Traits.scala b/src/main/scala/stdlib/Traits.scala index 4ac33c55..3f1f5545 100644 --- a/src/main/scala/stdlib/Traits.scala +++ b/src/main/scala/stdlib/Traits.scala @@ -71,8 +71,8 @@ object Traits extends AnyFlatSpec with Matchers with org.scalaexercises.definiti } /** - * A class can only extend from one class or trait, any subsequent extension should use the - * keyword `with`: + * A class can mixin from several traits, but only the first one uses the `extend` keyword. + * Any subsequent mixed-in trait should use the keyword `with`: */ def extendsFromOneTraits(res0: String) = { case class Event(name: String) From 6b4b1d585492e028d5ac6e70d2c88416bf92addb Mon Sep 17 00:00:00 2001 From: Luis Osa Date: Sun, 24 Sep 2023 21:30:04 +0200 Subject: [PATCH 2/2] Use trait instead of class --- src/main/scala/stdlib/Traits.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/stdlib/Traits.scala b/src/main/scala/stdlib/Traits.scala index 3f1f5545..080ca2d8 100644 --- a/src/main/scala/stdlib/Traits.scala +++ b/src/main/scala/stdlib/Traits.scala @@ -81,7 +81,7 @@ object Traits extends AnyFlatSpec with Matchers with org.scalaexercises.definiti def listen(event: Event): String } - class OurListener + trait OurListener class MyListener extends OurListener with EventListener { def listen(event: Event): String = {