Skip to content
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

Improve deprecation warnings for commas with whitespace used as using directive value separators #3366

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Improve deprecation warnings for commas with whitespace used as using directive value separators #3366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd247d6
Bump `using_directives` to 1.1.3
Gedochao Dec 12, 2024
94c5fe2
Test for correct number of deprecation warnings when commas are used …
Gedochao Dec 12, 2024
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
8 changes: 5 additions & 3 deletions modules/integration/src/test/scala/scala/cli/integration/RunTestsDefault.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,16 @@ class RunTestsDefault extends RunTestDefinitions
) {
val inputPath = os.rel / "example.sc"
TestInputs(inputPath ->
"""//> using options -Werror, -Wconf:cat=deprecation:e
"""//> using options -Werror, -Wconf:cat=deprecation:e, -Wconf:cat=unused:e
|println("Deprecation warnings should have been printed")
|""".stripMargin)
.fromRoot { root =>
val res = os.proc(TestUtil.cli, "run", extraOptions, inputPath)
.call(cwd = root, stderr = os.Pipe)
val err = res.err.trim()
expect(err.contains("Use of commas as separators is deprecated"))
val err = res.err.trim()
val expectedWarning = "Use of commas as separators is deprecated"
expect(err.contains(expectedWarning))
expect(err.linesIterator.count(_.contains(expectedWarning)) == 2)
}
}
}
2 changes: 1 addition & 1 deletion project/deps.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ object Deps {
val typelevelToolkitVersion = "0.1.29"
def typelevelToolkit = ivy"org.typelevel:toolkit:$typelevelToolkitVersion"
def typelevelToolkitTest = ivy"org.typelevel:toolkit-test:$typelevelToolkitVersion"
def usingDirectives = ivy"org.virtuslab:using_directives:1.1.2"
def usingDirectives = ivy"org.virtuslab:using_directives:1.1.3"
// Lives at https://github.com/VirtusLab/no-crc32-zip-input-stream, see #865
// This provides a ZipInputStream that doesn't verify CRC32 checksums, that users
// can enable by setting SCALA_CLI_VENDORED_ZIS=true in the environment, to workaround
Expand Down