Merging debian version 1.65.0+dfsg1-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 26 deletions

diff --git a/src/test/ui/json-bom-plus-crlf.rs b/src/test/ui/json-bom-plus-crlf.rs
deleted file mode 100644
index be5b7dd2a..000000000
--- a/src/test/ui/json-bom-plus-crlf.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// (This line has BOM so it's ignored by compiletest for directives)

-//

-// compile-flags: --json=diagnostic-short --error-format=json

-// ignore-tidy-cr

-

-// For easier verifying, the byte offsets in this file should match those

-// in the json_bom_plus_crlf_multifile_aux.rs - given the actual fn is

-// identical (just with a different, but equally sized name), the easiest way

-// to do this is to ensure the two files are of equal size on disk.

-

-// N.B., this file needs CRLF line endings. The .gitattributes file in

-// this directory should enforce it.

-

-fn main() {

-

-    let s : String = 1;  // Error in the middle of line.

-

-    let s : String = 1

-    ;  // Error before the newline.

-

-    let s : String =

-1;  // Error after the newline.

-

-    let s : String = (

-    );  // Error spanning the newline.

-}