about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Scherer <github35764891676564198441@oli-obk.de>2019-04-16 15:53:37 +0200
committerOliver Scherer <github35764891676564198441@oli-obk.de>2019-04-16 17:35:49 +0200
commit5c6a43a58bfb31bcabfd52e2c378cdaa48a68290 (patch)
treeba16b80195d46dd1fe828061e9b38d769b41f915
parent325936ac209b8942b630e922924fc2233c94a67e (diff)
downloadrust-5c6a43a58bfb31bcabfd52e2c378cdaa48a68290.tar.gz
rust-5c6a43a58bfb31bcabfd52e2c378cdaa48a68290.zip
Don't test json with color codes on windows
-rw-r--r--src/test/ui/lint/use_suggestion_json.rs1
-rw-r--r--src/test/ui/lint/use_suggestion_json.stderr106
2 files changed, 54 insertions, 53 deletions
diff --git a/src/test/ui/lint/use_suggestion_json.rs b/src/test/ui/lint/use_suggestion_json.rs
index d62f8f110e0..9679ce4a2ae 100644
--- a/src/test/ui/lint/use_suggestion_json.rs
+++ b/src/test/ui/lint/use_suggestion_json.rs
@@ -1,4 +1,5 @@
 // ignore-cloudabi
+// ignore-windows
 // compile-flags: --error-format pretty-json -Zunstable-options --json-rendered=termcolor
 
 // The output for humans should just highlight the whole span without showing
diff --git a/src/test/ui/lint/use_suggestion_json.stderr b/src/test/ui/lint/use_suggestion_json.stderr
index 0e3617b1e27..632666db75b 100644
--- a/src/test/ui/lint/use_suggestion_json.stderr
+++ b/src/test/ui/lint/use_suggestion_json.stderr
@@ -73,10 +73,10 @@ mod foo {
   "spans": [
     {
       "file_name": "$DIR/use_suggestion_json.rs",
-      "byte_start": 466,
-      "byte_end": 470,
-      "line_start": 11,
-      "line_end": 11,
+      "byte_start": 484,
+      "byte_end": 488,
+      "line_start": 12,
+      "line_end": 12,
       "column_start": 12,
       "column_end": 16,
       "is_primary": true,
@@ -101,10 +101,10 @@ mod foo {
       "spans": [
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -124,10 +124,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -147,10 +147,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -170,10 +170,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -193,10 +193,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -216,10 +216,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -239,10 +239,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -262,10 +262,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -285,10 +285,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -308,10 +308,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -331,10 +331,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -354,10 +354,10 @@ mod foo {
         },
         {
           "file_name": "$DIR/use_suggestion_json.rs",
-          "byte_start": 443,
-          "byte_end": 443,
-          "line_start": 10,
-          "line_end": 10,
+          "byte_start": 461,
+          "byte_end": 461,
+          "line_start": 11,
+          "line_end": 11,
           "column_start": 1,
           "column_end": 1,
           "is_primary": true,
@@ -381,7 +381,7 @@ mod foo {
     }
   ],
   "rendered": "\u001b[0m\u001b[1m\u001b[38;5;9merror[E0412]\u001b[0m\u001b[0m\u001b[1m: cannot find type `Iter` in this scope\u001b[0m
-\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0m$DIR/use_suggestion_json.rs:11:12\u001b[0m
+\u001b[0m  \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m--> \u001b[0m\u001b[0m$DIR/use_suggestion_json.rs:12:12\u001b[0m
 \u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m|\u001b[0m
 \u001b[0m\u001b[1m\u001b[38;5;12mLL\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m    let x: Iter;\u001b[0m
 \u001b[0m   \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;12m| \u001b[0m\u001b[0m           \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;9m^^^^\u001b[0m\u001b[0m \u001b[0m\u001b[0m\u001b[1m\u001b[38;5;9mnot found in this scope\u001b[0m