Skip to content

change lower bound of Option.orNull to nullable #25733

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.

Sign up for GitHub

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
sjrd merged 4 commits into from
Apr 29, 2026
Merged

change lower bound of Option.orNull to nullable #25733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cffb20
change lower bound of Option.orNull to require nullable type
olhotak Apr 8, 2026
d9290dd
alternative change to preserve TASTy compatibility
olhotak Apr 18, 2026
b167d96
overrule Mima filter for None.orNull
olhotak Apr 26, 2026
7090793
move Mima overrule ProblemFilters line to top of list
olhotak Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion library/src/scala/Option.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,10 @@ sealed abstract class Option[+A] extends IterableOnce[A] with Product with Seria
* val textField = new JComponent(initialText.orNull,20)
* ```
*/
@inline final def orNull[A1 >: A](implicit ev: Null <:< A1): A1 = this getOrElse ev(null)
@inline final def orNull: A | Null = this.getOrElse(null)

// for binary and TASTy backwards compatibility
@deprecated @inline protected final def orNull[A1 >: A](implicit ev: Null <:< A1): A1 = this getOrElse ev(null)

/** Returns a $some containing the result of applying $f to this $option's
* value if this $option is nonempty.
Expand Down
1 change: 1 addition & 0 deletions project/MiMaFilters.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ object MiMaFilters {

// Breaking changes since last reference version
Build.mimaPreviousDottyVersion -> Seq(
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.None.orNull"),
ProblemFilters.exclude[MissingTypesProblem]("scala.util.control.NonLocalReturns$ReturnThrowable"),
// THIS IS FINE, IT SHOULD HAVE BEEN THIS WAY
ProblemFilters.exclude[MissingTypesProblem]("scala.Function1$"),
Expand Down
6 changes: 6 additions & 0 deletions tests/explicit-nulls/pos/option-ornull.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import java.util.Optional

class CheckResult(result: Option[Unit]):
def foo =
val x: Optional[Unit] = Optional.ofNullable(result.orNull)
42
Loading