From 8175679d2067fbc8bd50016b7d2db4f95df2c5c5 Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Mon, 14 Mar 2022 15:56:00 +0100 Subject: [PATCH 1/2] Remove postfixOps from dotty benchmark options --- bench/profiles/projects.yml | 2 +- project/Build.scala | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index ed89a95740c8..909f81172b3f 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -26,7 +26,7 @@ charts: scripts: dotty: - - measure -feature -deprecation -unchecked -Xfatal-warnings -encoding UTF8 -language:existentials,higherKinds,implicitConversions,postfixOps -Yexplicit-nulls -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -feature -deprecation -unchecked -Xfatal-warnings -encoding UTF8 -language:existentials,higherKinds,implicitConversions -Yexplicit-nulls -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) re2s: - measure $(find $PROG_HOME/tests/re2s/src -name *.scala) diff --git a/project/Build.scala b/project/Build.scala index c71506ebe97e..9a506c2e7366 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -770,6 +770,7 @@ object Build { ) }, + // Note: bench/profiles/projects.yml should be updated accordingly. Compile / scalacOptions ++= Seq("-Yexplicit-nulls"), repl := (Compile / console).value, From d25a61547724ec9c5883eef40c8cef92c7daacfa Mon Sep 17 00:00:00 2001 From: Matt Bovel Date: Mon, 14 Mar 2022 19:12:48 +0100 Subject: [PATCH 2/2] Remove existentials and higherKinds features for dotty builds --- bench/profiles/projects.yml | 2 +- project/Build.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bench/profiles/projects.yml b/bench/profiles/projects.yml index 909f81172b3f..f1133d180c54 100644 --- a/bench/profiles/projects.yml +++ b/bench/profiles/projects.yml @@ -26,7 +26,7 @@ charts: scripts: dotty: - - measure -feature -deprecation -unchecked -Xfatal-warnings -encoding UTF8 -language:existentials,higherKinds,implicitConversions -Yexplicit-nulls -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) + - measure -feature -deprecation -unchecked -Xfatal-warnings -encoding UTF8 -language:implicitConversions -Yexplicit-nulls -with-compiler $(find $PROG_HOME/dotty/compiler/src/dotty -name *.scala -o -name *.java) re2s: - measure $(find $PROG_HOME/tests/re2s/src -name *.scala) diff --git a/project/Build.scala b/project/Build.scala index 9a506c2e7366..0b8318f35e05 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -171,7 +171,7 @@ object Build { "-unchecked", "-Xfatal-warnings", "-encoding", "UTF8", - "-language:existentials,higherKinds,implicitConversions" + "-language:implicitConversions" ), (Compile / compile / javacOptions) ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),