Skip to content

chore: make a few adjustments to merge the scala2 stdlib #23527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 15, 2025

Conversation

hamzaremmal
Copy link
Member

To be able to merge #23522, we need to make some adjustments to the tests and undo them later when the stdlib will be fully independent of scala 2.

[skip ci]

Copy link
Contributor

@Gedochao Gedochao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -155,11 +155,15 @@ class BootstrappedOnlyCompilationTests {

@Test def picklingWithCompiler: Unit = {
implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler")
// Exclude this file from the test as it contains some changes that require scala 2.13.17
// This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT

Suggested change
// This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)
//TODO: This filter can be dropped once we drop the dependency to Scala 2 (in 3.8.0)

@hamzaremmal hamzaremmal merged commit 3b9a505 into scala:main Jul 15, 2025
29 checks passed
@hamzaremmal hamzaremmal deleted the filter-pickling-tests branch July 15, 2025 08:45
@@ -29,7 +29,7 @@ class TastyBootstrapTests {
* bootstrapped, and making sure that TASTY can link against a compiled
* version of Dotty, and compiling the compiler using the SemanticDB generation
*/
@Test def tastyBootstrap: Unit = {
@Ignore @Test def tastyBootstrap: Unit = {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will undo this change once I merge #23522 and ignore AnyVal.scala

hamzaremmal added a commit that referenced this pull request Jul 15, 2025
dotty is not able to compile `scala.AnyVal` from source. We ignore the
source file of `scala.AnyVal` for now.
~We also partially revert #23527 to enable back a disabled test because
of the reason mentioned before.~


EDIT: enabling the test back requires to fix the issue with `-Ycheck`,
(which cannot be fixed before 3.8.0? at least not fully)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants