Skip to content

Commit

Permalink
Fix conflict with new ScalaSettings (#20264)
Browse files Browse the repository at this point in the history
Conflict between #18783 and #19766.

See `val sets = ScalaSettings` in the test just above.
  • Loading branch information
nicolasstucki authored Apr 25, 2024
2 parents 00802ab + 48bfe81 commit 1cf779c
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class ScalaSettingsTests:
private def wconfSrcFilterTest(argsStr: String,
warning: reporting.Diagnostic.Warning): Either[List[String], reporting.Action] =
import reporting.Diagnostic
val settings = new ScalaSettings
val settings = ScalaSettings
val args = ArgsSummary(settings.defaultState, List(argsStr), errors = Nil, warnings = Nil)
val proc = settings.processArguments(args, processAll = true, skipped = Nil)
val wconfStr = settings.Wconf.valueIn(proc.sstate)
Expand Down

0 comments on commit 1cf779c

Please sign in to comment.