toml: fix for single \r occurence in multi-line """ strings (\r\n is still allowed) (#26029)

larpon · web-flow · commit 2b6166945257 · 2025-12-19T14:34:58.000+02:00
diff --git a/vlib/toml/scanner/scanner.v b/vlib/toml/scanner/scanner.v
@@ -486,7 +486,7 @@ fn (mut s Scanner) extract_multiline_string() !string {
 		c := u8(s.at())
 		util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'c: `${c.ascii_str()}` / ${c} (quote type: ${quote}/${quote.ascii_str()})')
 
-		if c == `\r` {
+		if c == `\r` && s.peek(1) == `\n` {
 			continue
 		}
 		if c == `\n` {
diff --git a/vlib/toml/tests/burntsushi_toml_test.v b/vlib/toml/tests/burntsushi_toml_test.v
@@ -1,6 +1,3 @@
-// vtest flaky: true
-// vtest retry: 3
-
 // Instructions for developers:
 // The actual tests and data can be obtained by doing:
 // `git clone -n https://github.com/toml-lang/toml-test.git vlib/toml/tests/testdata/burntsushi`

Original file line number	Diff line number	Diff line change
`@@ -486,7 +486,7 @@ fn (mut s Scanner) extract_multiline_string() !string {`
`486`	`486`	`c := u8(s.at())`
`487`	`487`	util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'c: `${c.ascii_str()}` / ${c} (quote type: ${quote}/${quote.ascii_str()})')
`488`	`488`
`489`		- if c == `\r` {
	`489`	+ if c == `\r` && s.peek(1) == `\n` {
`490`	`490`	`continue`
`491`	`491`	`}`
`492`	`492`	if c == `\n` {