From 38520e5cb73ffb698cf631241d77a901ab75c77c Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Thu, 17 Dec 2020 09:30:30 +0100
Subject: [PATCH] Update to 3.0.0-M3

---
 .gitignore                            | 1 +
 build.sbt                             | 6 +++---
 project/plugins.sbt                   | 2 +-
 src/main/scala/Conversion.scala       | 2 +-
 src/main/scala/ImpliedInstances.scala | 6 +++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8a4ff96..b058765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ project/boot/
 project/plugins/project/
 project/local-plugins.sbt
 .history
+.bsp
 
 # Scala-IDE specific
 .scala_dependencies
diff --git a/build.sbt b/build.sbt
index 331b13c..8e700ec 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,11 +1,11 @@
 lazy val root = project
   .in(file("."))
   .settings(
-    name := "dotty-example-project",
-    description := "Example sbt project that compiles using Dotty",
+    name := "scala3-example-project",
+    description := "Example sbt project that compiles using Scala 3",
     version := "0.1.0",
 
-    scalaVersion := "3.0.0-M2",
+    scalaVersion := "3.0.0-M3",
 
     useScala3doc := true,
   )
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 83a3da1..b12914f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.6")
+addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.0")
diff --git a/src/main/scala/Conversion.scala b/src/main/scala/Conversion.scala
index 8e4852a..440d70a 100644
--- a/src/main/scala/Conversion.scala
+++ b/src/main/scala/Conversion.scala
@@ -10,7 +10,7 @@ object Conversion {
 
   def convert[T, U](x: T)(using converter: Conversion[T, U]): U = converter(x)
 
-  given IntWrapperToDoubleWrapper as Conversion[IntWrapper, DoubleWrapper] = new Conversion[IntWrapper, DoubleWrapper] {
+  given IntWrapperToDoubleWrapper: Conversion[IntWrapper, DoubleWrapper] = new Conversion[IntWrapper, DoubleWrapper] {
     override def apply(i: IntWrapper): DoubleWrapper = new DoubleWrapper(i.a.toDouble)
   }
 
diff --git a/src/main/scala/ImpliedInstances.scala b/src/main/scala/ImpliedInstances.scala
index f75c2e0..9ca7ef2 100644
--- a/src/main/scala/ImpliedInstances.scala
+++ b/src/main/scala/ImpliedInstances.scala
@@ -18,10 +18,10 @@ object ImpliedInstances {
       override def parse(s: String): Try[A] = f(s)
     }
 
-    given stringParser as StringParser[String] = baseParser(Success(_))
-    given intParser as StringParser[Int] = baseParser(s ⇒ Try(s.toInt))
+    given stringParser: StringParser[String] = baseParser(Success(_))
+    given intParser: StringParser[Int] = baseParser(s ⇒ Try(s.toInt))
 
-    given optionParser[A](using parser: => StringParser[A]) as StringParser[Option[A]] = new StringParser[Option[A]] {
+    given optionParser[A](using parser: => StringParser[A]): StringParser[Option[A]] = new StringParser[Option[A]] {
       override def parse(s: String): Try[Option[A]] = s match {
         case "" ⇒ Success(None) // implicit parser not used.
         case str ⇒ parser.parse(str).map(x ⇒ Some(x)) // implicit parser is evaluated at here