@@ -356,8 +356,10 @@ where
356
356
let start = src. len ( ) - chars. as_str ( ) . len ( ) - c. len_utf8 ( ) ;
357
357
let res = match c {
358
358
'\\' => {
359
- match chars. clone ( ) . next ( ) {
359
+ let mut chars_clone = chars. clone ( ) ;
360
+ match chars_clone. next ( ) {
360
361
Some ( '\n' ) => {
362
+ chars = chars_clone;
361
363
// Rust language specification requires us to skip whitespaces
362
364
// if unescaped '\' character is followed by '\n'.
363
365
// For details see [Rust language reference]
@@ -379,30 +381,41 @@ where
379
381
}
380
382
}
381
383
384
+ /// Skip ASCII whitespace, except for the formfeed character
385
+ /// (see [this issue](https://github.com/rust-lang/rust/issues/136600)).
386
+ /// Warns on unescaped newline and following non-ASCII whitespace.
382
387
fn skip_ascii_whitespace < F > ( chars : & mut Chars < ' _ > , start : usize , callback : & mut F )
383
388
where
384
389
F : FnMut ( Range < usize > , EscapeError ) ,
385
390
{
386
- let tail = chars. as_str ( ) ;
387
- let first_non_space = tail
388
- . bytes ( )
389
- . position ( |b| b != b' ' && b != b'\t' && b != b'\n' && b != b'\r' )
390
- . unwrap_or ( tail. len ( ) ) ;
391
- if tail[ 1 ..first_non_space] . contains ( '\n' ) {
392
- // The +1 accounts for the escaping slash.
393
- let end = start + first_non_space + 1 ;
391
+ // the escaping slash and newline characters add 2 bytes
392
+ let mut end = start + 2 ;
393
+ let mut contains_nl = false ;
394
+
395
+ // manual next_if loop
396
+ let mut next_char;
397
+ loop {
398
+ let mut chars_clone = chars. clone ( ) ;
399
+ next_char = chars_clone. next ( ) ;
400
+ match next_char {
401
+ Some ( c) if c. is_ascii_whitespace ( ) && c != '\x0c' => {
402
+ * chars = chars_clone;
403
+ end += 1 ;
404
+ contains_nl |= c == '\n' ;
405
+ }
406
+ _ => break ,
407
+ }
408
+ }
409
+
410
+ if contains_nl {
394
411
callback ( start..end, EscapeError :: MultipleSkippedLinesWarning ) ;
395
412
}
396
- let tail = & tail[ first_non_space..] ;
397
- if let Some ( c) = tail. chars ( ) . next ( ) {
413
+ if let Some ( c) = next_char {
398
414
if c. is_whitespace ( ) {
399
- // For error reporting, we would like the span to contain the character that was not
400
- // skipped. The +1 is necessary to account for the leading \ that started the escape.
401
- let end = start + first_non_space + c. len_utf8 ( ) + 1 ;
402
- callback ( start..end, EscapeError :: UnskippedWhitespaceWarning ) ;
415
+ // for error reporting, include the character that was not skipped in the span
416
+ callback ( start..end + c. len_utf8 ( ) , EscapeError :: UnskippedWhitespaceWarning ) ;
403
417
}
404
418
}
405
- * chars = tail. chars ( ) ;
406
419
}
407
420
408
421
/// Takes a contents of a string literal (without quotes) and produces a
0 commit comments