From 60892d78c7a85998285c78e4087addf34f80e799 Mon Sep 17 00:00:00 2001 From: Magnus Madsen Date: Mon, 14 Nov 2022 16:14:01 +0100 Subject: [PATCH] fix: Revert "chore: update Scala 2 version" (#4916) --- AUTHORS.md | 3 +-- build.gradle | 4 ++-- main/src/ca/uwaterloo/flix/language/phase/Weeder.scala | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 6d23695ae60..99664ba9801 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -50,5 +50,4 @@ By adding your name to this document, you agree to release all your contribution - [Kengo TODA](http://github.com/KengoTODA/) - [Darius Tan](https://github.com/thinking-tower) - [Paul Butcher](https://github.com/paulbutcher) -- [Daniel Anker Hermansen](https://github.com/Daniel-Anker-Hermansen) -- [Stéphane Micheloud](https://github.com/michelou) +- [Daniel Anker Hermansen](https://github.com/Daniel-Anker-Hermansen) \ No newline at end of file diff --git a/build.gradle b/build.gradle index c2e6ebeed6f..eb8c8d528cf 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ repositories { } dependencies { - implementation 'org.scala-lang:scala-library:2.13.10' - implementation 'org.scala-lang:scala-reflect:2.13.10' + implementation 'org.scala-lang:scala-library:2.13.5' + implementation 'org.scala-lang:scala-reflect:2.13.5' implementation files('lib/org.java_websocket-1.3.9.jar') implementation files('lib/org.jline-3.5.1.jar') diff --git a/main/src/ca/uwaterloo/flix/language/phase/Weeder.scala b/main/src/ca/uwaterloo/flix/language/phase/Weeder.scala index 4853fbe5788..64fd03461cf 100644 --- a/main/src/ca/uwaterloo/flix/language/phase/Weeder.scala +++ b/main/src/ca/uwaterloo/flix/language/phase/Weeder.scala @@ -1326,10 +1326,10 @@ object Weeder { mapN(visitExp(exp1, senv), visitExp(exp2, senv)) { case (e1, e2) => val loc = mkSL(sp1, sp2) - val enum0 = Name.mkQName("List", sp1, sp2) + val enum = Name.mkQName("List", sp1, sp2) val tag = Name.Ident(sp1, "Cons", sp2) val exp = WeededAst.Expression.Tuple(List(e1, e2), loc) - WeededAst.Expression.Tag(Some(enum0), tag, Some(exp), loc) + WeededAst.Expression.Tag(Some(enum), tag, Some(exp), loc) } case ParsedAst.Expression.FAppend(exp1, sp1, sp2, exp2) => @@ -2143,10 +2143,10 @@ object Weeder { mapN(visitPattern(pat1), visitPattern(pat2)) { case (hd, tl) => val loc = mkSL(sp1, sp2) - val enum0 = Name.mkQName("List", sp1, sp2) + val enum = Name.mkQName("List", sp1, sp2) val tag = Name.Ident(sp1, "Cons", sp2) val pat = WeededAst.Pattern.Tuple(List(hd, tl), loc) - WeededAst.Pattern.Tag(Some(enum0), tag, pat, loc) + WeededAst.Pattern.Tag(Some(enum), tag, pat, loc) } }