Skip to content

Commit 66a4fc8

Browse files
committed
Rollup merge of rust-lang#28876 - steveklabnik:oops, r=Gankro
In rust-lang#28864, @Aarzee submitted some whitespace fixes. I r+'d it. But @retp998 noticed[1] that this file is explicitly a test of this kind of whitespace, and so I shouldn't have changed it. This restores the old line endings. 1: rust-lang#28864 (comment)
2 parents 3ec38c8 + 4d40dd3 commit 66a4fc8

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-cr ignore-license
22
// ignore-tidy-cr (repeated again because of tidy bug)
33
// license is ignored because tidy can't handle the CRLF here properly.
4-
4+
55
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
66
// file at the top-level directory of this distribution and at
77
// http://rust-lang.org/COPYRIGHT.
@@ -11,33 +11,33 @@
1111
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
1212
// option. This file may not be copied, modified, or distributed
1313
// except according to those terms.
14-
14+
1515
// NB: this file needs CRLF line endings. The .gitattributes file in
1616
// this directory should enforce it.
17-
17+
1818
// ignore-pretty
19-
19+
2020
/// Doc comment that ends in CRLF
2121
pub fn foo() {}
22-
22+
2323
/** Block doc comment that
2424
* contains CRLF characters
2525
*/
2626
pub fn bar() {}
27-
27+
2828
fn main() {
2929
let s = "string
3030
literal";
3131
assert_eq!(s, "string\nliteral");
32-
32+
3333
let s = "literal with \
3434
escaped newline";
3535
assert_eq!(s, "literal with escaped newline");
36-
36+
3737
let s = r"string
3838
literal";
3939
assert_eq!(s, "string\nliteral");
40-
40+
4141
// validate that our source file has CRLF endings
4242
let source = include_str!("lexer-crlf-line-endings-string-literal-doc-comment.rs");
4343
assert!(source.contains("string\r\nliteral"));

0 commit comments

Comments
 (0)