]> git.lizzy.rs Git - rust.git/commitdiff
session: `terminal-width` -> `output-width`
authorDavid Wood <david.wood@huawei.com>
Thu, 16 Jun 2022 15:39:11 +0000 (16:39 +0100)
committerDavid Wood <david.wood@huawei.com>
Wed, 6 Jul 2022 16:38:18 +0000 (17:38 +0100)
Rename the `--terminal-width` flag to `--output-width` as the behaviour
doesn't just apply to terminals (and so is slightly less accurate).

Signed-off-by: David Wood <david.wood@huawei.com>
49 files changed:
compiler/rustc_errors/src/emitter.rs
compiler/rustc_errors/src/json.rs
compiler/rustc_session/src/config.rs
compiler/rustc_session/src/options.rs
compiler/rustc_session/src/session.rs
src/librustdoc/config.rs
src/librustdoc/core.rs
src/librustdoc/lib.rs
src/test/run-make/issue-88756-default-output/output-default.stdout
src/test/rustdoc-ui/output-width.rs [new file with mode: 0644]
src/test/rustdoc-ui/output-width.stderr [new file with mode: 0644]
src/test/rustdoc-ui/terminal-width.rs [deleted file]
src/test/rustdoc-ui/terminal-width.stderr [deleted file]
src/test/ui/output-width/flag-human.rs [new file with mode: 0644]
src/test/ui/output-width/flag-human.stderr [new file with mode: 0644]
src/test/ui/output-width/flag-json.rs [new file with mode: 0644]
src/test/ui/output-width/flag-json.stderr [new file with mode: 0644]
src/test/ui/output-width/non-1-width-unicode-multiline-label.rs [new file with mode: 0644]
src/test/ui/output-width/non-1-width-unicode-multiline-label.stderr [new file with mode: 0644]
src/test/ui/output-width/non-whitespace-trimming-2.rs [new file with mode: 0644]
src/test/ui/output-width/non-whitespace-trimming-2.stderr [new file with mode: 0644]
src/test/ui/output-width/non-whitespace-trimming-unicode.rs [new file with mode: 0644]
src/test/ui/output-width/non-whitespace-trimming-unicode.stderr [new file with mode: 0644]
src/test/ui/output-width/non-whitespace-trimming.rs [new file with mode: 0644]
src/test/ui/output-width/non-whitespace-trimming.stderr [new file with mode: 0644]
src/test/ui/output-width/tabs-trimming.rs [new file with mode: 0644]
src/test/ui/output-width/tabs-trimming.stderr [new file with mode: 0644]
src/test/ui/output-width/whitespace-trimming-2.rs [new file with mode: 0644]
src/test/ui/output-width/whitespace-trimming-2.stderr [new file with mode: 0644]
src/test/ui/output-width/whitespace-trimming.rs [new file with mode: 0644]
src/test/ui/output-width/whitespace-trimming.stderr [new file with mode: 0644]
src/test/ui/terminal-width/flag-human.rs [deleted file]
src/test/ui/terminal-width/flag-human.stderr [deleted file]
src/test/ui/terminal-width/flag-json.rs [deleted file]
src/test/ui/terminal-width/flag-json.stderr [deleted file]
src/test/ui/terminal-width/non-1-width-unicode-multiline-label.rs [deleted file]
src/test/ui/terminal-width/non-1-width-unicode-multiline-label.stderr [deleted file]
src/test/ui/terminal-width/non-whitespace-trimming-2.rs [deleted file]
src/test/ui/terminal-width/non-whitespace-trimming-2.stderr [deleted file]
src/test/ui/terminal-width/non-whitespace-trimming-unicode.rs [deleted file]
src/test/ui/terminal-width/non-whitespace-trimming-unicode.stderr [deleted file]
src/test/ui/terminal-width/non-whitespace-trimming.rs [deleted file]
src/test/ui/terminal-width/non-whitespace-trimming.stderr [deleted file]
src/test/ui/terminal-width/tabs-trimming.rs [deleted file]
src/test/ui/terminal-width/tabs-trimming.stderr [deleted file]
src/test/ui/terminal-width/whitespace-trimming-2.rs [deleted file]
src/test/ui/terminal-width/whitespace-trimming-2.stderr [deleted file]
src/test/ui/terminal-width/whitespace-trimming.rs [deleted file]
src/test/ui/terminal-width/whitespace-trimming.stderr [deleted file]

index 6d74e9a9f2b9e5dd20ab8c134b8d21d05934142e..802cd1a1655029d40718154dbc79dad8816268ee 100644 (file)
@@ -63,7 +63,7 @@ pub fn new_emitter(
         bundle: Option<Lrc<FluentBundle>>,
         fallback_bundle: LazyFallbackBundle,
         teach: bool,
-        terminal_width: Option<usize>,
+        output_width: Option<usize>,
         macro_backtrace: bool,
     ) -> EmitterWriter {
         let (short, color_config) = self.unzip();
@@ -76,7 +76,7 @@ pub fn new_emitter(
             short,
             teach,
             color,
-            terminal_width,
+            output_width,
             macro_backtrace,
         )
     }
@@ -710,7 +710,7 @@ pub struct EmitterWriter {
     short_message: bool,
     teach: bool,
     ui_testing: bool,
-    terminal_width: Option<usize>,
+    output_width: Option<usize>,
 
     macro_backtrace: bool,
 }
@@ -730,7 +730,7 @@ pub fn stderr(
         fallback_bundle: LazyFallbackBundle,
         short_message: bool,
         teach: bool,
-        terminal_width: Option<usize>,
+        output_width: Option<usize>,
         macro_backtrace: bool,
     ) -> EmitterWriter {
         let dst = Destination::from_stderr(color_config);
@@ -742,7 +742,7 @@ pub fn stderr(
             short_message,
             teach,
             ui_testing: false,
-            terminal_width,
+            output_width,
             macro_backtrace,
         }
     }
@@ -755,7 +755,7 @@ pub fn new(
         short_message: bool,
         teach: bool,
         colored: bool,
-        terminal_width: Option<usize>,
+        output_width: Option<usize>,
         macro_backtrace: bool,
     ) -> EmitterWriter {
         EmitterWriter {
@@ -766,7 +766,7 @@ pub fn new(
             short_message,
             teach,
             ui_testing: false,
-            terminal_width,
+            output_width,
             macro_backtrace,
         }
     }
@@ -1615,7 +1615,7 @@ fn emit_message_default(
                     width_offset + annotated_file.multiline_depth + 1
                 };
 
-                let column_width = if let Some(width) = self.terminal_width {
+                let column_width = if let Some(width) = self.output_width {
                     width.saturating_sub(code_offset)
                 } else if self.ui_testing {
                     DEFAULT_COLUMN_WIDTH
index d4d1491c16945f40d2b1225bac3be0a39a3bc190..1e87e70922b73424be7d4a8afa90682854150205 100644 (file)
@@ -42,7 +42,7 @@ pub struct JsonEmitter {
     pretty: bool,
     ui_testing: bool,
     json_rendered: HumanReadableErrorType,
-    terminal_width: Option<usize>,
+    output_width: Option<usize>,
     macro_backtrace: bool,
 }
 
@@ -54,7 +54,7 @@ pub fn stderr(
         fallback_bundle: LazyFallbackBundle,
         pretty: bool,
         json_rendered: HumanReadableErrorType,
-        terminal_width: Option<usize>,
+        output_width: Option<usize>,
         macro_backtrace: bool,
     ) -> JsonEmitter {
         JsonEmitter {
@@ -66,7 +66,7 @@ pub fn stderr(
             pretty,
             ui_testing: false,
             json_rendered,
-            terminal_width,
+            output_width,
             macro_backtrace,
         }
     }
@@ -76,7 +76,7 @@ pub fn basic(
         json_rendered: HumanReadableErrorType,
         fluent_bundle: Option<Lrc<FluentBundle>>,
         fallback_bundle: LazyFallbackBundle,
-        terminal_width: Option<usize>,
+        output_width: Option<usize>,
         macro_backtrace: bool,
     ) -> JsonEmitter {
         let file_path_mapping = FilePathMapping::empty();
@@ -87,7 +87,7 @@ pub fn basic(
             fallback_bundle,
             pretty,
             json_rendered,
-            terminal_width,
+            output_width,
             macro_backtrace,
         )
     }
@@ -100,7 +100,7 @@ pub fn new(
         fallback_bundle: LazyFallbackBundle,
         pretty: bool,
         json_rendered: HumanReadableErrorType,
-        terminal_width: Option<usize>,
+        output_width: Option<usize>,
         macro_backtrace: bool,
     ) -> JsonEmitter {
         JsonEmitter {
@@ -112,7 +112,7 @@ pub fn new(
             pretty,
             ui_testing: false,
             json_rendered,
-            terminal_width,
+            output_width,
             macro_backtrace,
         }
     }
@@ -345,7 +345,7 @@ fn flush(&mut self) -> io::Result<()> {
                 je.fluent_bundle.clone(),
                 je.fallback_bundle.clone(),
                 false,
-                je.terminal_width,
+                je.output_width,
                 je.macro_backtrace,
             )
             .ui_testing(je.ui_testing)
index 2650ad528790237e49ac9603fd158df255b385db..bad9fb576bf3b3e9f12cac855f5f7c080447096d 100644 (file)
@@ -726,7 +726,7 @@ fn default() -> Options {
             prints: Vec::new(),
             cg: Default::default(),
             error_format: ErrorOutputType::default(),
-            terminal_width: None,
+            output_width: None,
             externs: Externs(BTreeMap::new()),
             crate_name: None,
             libs: Vec::new(),
@@ -1430,8 +1430,8 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
         ),
         opt::opt_s(
             "",
-            "terminal-width",
-            "Inform rustc of the width of the terminal so that errors can be truncated",
+            "output-width",
+            "Inform rustc of the width of the output so that errors can be truncated to fit",
             "WIDTH",
         ),
         opt::multi_s(
@@ -2209,8 +2209,8 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
 
     let error_format = parse_error_format(matches, color, json_rendered);
 
-    let terminal_width = matches.opt_get("terminal-width").unwrap_or_else(|_| {
-        early_error(error_format, "`--terminal-width` must be an positive integer");
+    let output_width = matches.opt_get("output-width").unwrap_or_else(|_| {
+        early_error(error_format, "`--output-width` must be an positive integer");
     });
 
     let unparsed_crate_types = matches.opt_strs("crate-type");
@@ -2485,7 +2485,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
         prints,
         cg,
         error_format,
-        terminal_width,
+        output_width,
         externs,
         unstable_features: UnstableFeatures::from_environment(crate_name.as_deref()),
         crate_name,
index 80e811bc1a745bbe2593f9e7cc52f748bc46d5ec..b544965f6f23ae62ff47394c0a94164189e9c7e9 100644 (file)
@@ -170,7 +170,7 @@ pub struct Options {
 
         test: bool [TRACKED],
         error_format: ErrorOutputType [UNTRACKED],
-        terminal_width: Option<usize> [UNTRACKED],
+        output_width: Option<usize> [UNTRACKED],
 
         /// If `Some`, enable incremental compilation, using the given
         /// directory to store intermediate results.
@@ -1389,6 +1389,8 @@ pub(crate) fn parse_branch_protection(
         "panic strategy for out-of-memory handling"),
     osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
         "pass `-install_name @rpath/...` to the macOS linker (default: no)"),
+    output_width: Option<usize> = (None, parse_opt_number, [UNTRACKED],
+        "set the current output width for diagnostic truncation"),
     panic_abort_tests: bool = (false, parse_bool, [TRACKED],
         "support compiling tests with panic=abort (default: no)"),
     panic_in_drop: PanicStrategy = (PanicStrategy::Unwind, parse_panic_strategy, [TRACKED],
@@ -1515,8 +1517,6 @@ pub(crate) fn parse_branch_protection(
         "show extended diagnostic help (default: no)"),
     temps_dir: Option<String> = (None, parse_opt_string, [UNTRACKED],
         "the directory the intermediate files are written to"),
-    terminal_width: Option<usize> = (None, parse_opt_number, [UNTRACKED],
-        "set the current terminal width"),
     // Diagnostics are considered side-effects of a query (see `QuerySideEffects`) and are saved
     // alongside query results and changes to translation options can affect diagnostics - so
     // translation options should be tracked.
index b5a72ed20c16afb3e826aef12eb9899c4024781c..e22b7a5539f7d63e65b860d06e133f9825714622 100644 (file)
@@ -1162,7 +1162,7 @@ fn default_emitter(
                         fallback_bundle,
                         short,
                         sopts.debugging_opts.teach,
-                        sopts.terminal_width,
+                        sopts.output_width,
                         macro_backtrace,
                     ),
                     Some(dst) => EmitterWriter::new(
@@ -1188,7 +1188,7 @@ fn default_emitter(
                 fallback_bundle,
                 pretty,
                 json_rendered,
-                sopts.terminal_width,
+                sopts.output_width,
                 macro_backtrace,
             )
             .ui_testing(sopts.debugging_opts.ui_testing),
@@ -1202,7 +1202,7 @@ fn default_emitter(
                 fallback_bundle,
                 pretty,
                 json_rendered,
-                sopts.terminal_width,
+                sopts.output_width,
                 macro_backtrace,
             )
             .ui_testing(sopts.debugging_opts.ui_testing),
index 0c913f8a07f9ac49daaad5672e7f93cf98182556..0285f15dd76fab81ccc2f0e912105514c6655a38 100644 (file)
@@ -74,7 +74,7 @@ pub(crate) struct Options {
     /// How to format errors and warnings.
     pub(crate) error_format: ErrorOutputType,
     /// Width of terminal to truncate errors appropriately.
-    pub(crate) terminal_width: Option<usize>,
+    pub(crate) output_width: Option<usize>,
     /// Library search paths to hand to the compiler.
     pub(crate) libs: Vec<SearchPath>,
     /// Library search paths strings to hand to the compiler.
@@ -336,12 +336,12 @@ pub(crate) fn from_matches(
         let config::JsonConfig { json_rendered, json_unused_externs, .. } =
             config::parse_json(matches);
         let error_format = config::parse_error_format(matches, color, json_rendered);
-        let terminal_width = matches.opt_get("terminal-width").unwrap_or_default();
+        let output_width = matches.opt_get("output-width").unwrap_or_default();
 
         let codegen_options = CodegenOptions::build(matches, error_format);
         let debugging_opts = DebuggingOptions::build(matches, error_format);
 
-        let diag = new_handler(error_format, None, terminal_width, &debugging_opts);
+        let diag = new_handler(error_format, None, output_width, &debugging_opts);
 
         // check for deprecated options
         check_deprecated_options(matches, &diag);
@@ -705,7 +705,7 @@ fn println_condition(condition: Condition) {
             input,
             proc_macro_crate,
             error_format,
-            terminal_width,
+            output_width,
             libs,
             lib_strs,
             externs,
index 7ed7243cb99c467844844bded718e8b73d550f53..d85e9d974dbcd3db43fe30d250e2749c4b43ec8e 100644 (file)
@@ -154,7 +154,7 @@ pub(crate) fn with_all_trait_impls(&mut self, f: impl FnOnce(&mut Self, &[DefId]
 pub(crate) fn new_handler(
     error_format: ErrorOutputType,
     source_map: Option<Lrc<source_map::SourceMap>>,
-    terminal_width: Option<usize>,
+    output_width: Option<usize>,
     debugging_opts: &DebuggingOptions,
 ) -> rustc_errors::Handler {
     let fallback_bundle =
@@ -170,7 +170,7 @@ pub(crate) fn new_handler(
                     fallback_bundle,
                     short,
                     debugging_opts.teach,
-                    terminal_width,
+                    output_width,
                     false,
                 )
                 .ui_testing(debugging_opts.ui_testing),
@@ -188,7 +188,7 @@ pub(crate) fn new_handler(
                     fallback_bundle,
                     pretty,
                     json_rendered,
-                    terminal_width,
+                    output_width,
                     false,
                 )
                 .ui_testing(debugging_opts.ui_testing),
@@ -209,7 +209,7 @@ pub(crate) fn create_config(
         crate_name,
         proc_macro_crate,
         error_format,
-        terminal_width,
+        output_width,
         libs,
         externs,
         mut cfgs,
@@ -268,7 +268,7 @@ pub(crate) fn create_config(
         actually_rustdoc: true,
         debugging_opts,
         error_format,
-        terminal_width,
+        output_width,
         edition,
         describe_lints,
         crate_name,
index d42bb02e0323e020b0a5a1abdb8be95c74b12fee..b0be3502baed3b2c6db003d1bb79fddc84b72444 100644 (file)
@@ -462,11 +462,11 @@ fn opts() -> Vec<RustcOptGroup> {
                 "human|json|short",
             )
         }),
-        unstable("terminal-width", |o| {
+        unstable("output-width", |o| {
             o.optopt(
                 "",
-                "terminal-width",
-                "Provide width of the terminal for truncated error messages",
+                "output-width",
+                "Provide width of the output for truncated error messages",
                 "WIDTH",
             )
         }),
@@ -744,7 +744,7 @@ fn main_options(options: config::Options) -> MainResult {
     let diag = core::new_handler(
         options.error_format,
         None,
-        options.terminal_width,
+        options.output_width,
         &options.debugging_opts,
     );
 
index 6ca2143efbdea51df74129967c97f338273c24a1..64b31adc63e4db61b47230ac0ca80a3c139ab8a4 100644 (file)
@@ -110,8 +110,8 @@ Options:
                         never = never colorize output
         --error-format human|json|short
                         How errors and other messages are produced
-        --terminal-width WIDTH
-                        Provide width of the terminal for truncated error
+        --output-width WIDTH
+                        Provide width of the output for truncated error
                         messages
         --json CONFIG   Configure the structure of JSON diagnostics
         --disable-minification 
diff --git a/src/test/rustdoc-ui/output-width.rs b/src/test/rustdoc-ui/output-width.rs
new file mode 100644 (file)
index 0000000..9fb6804
--- /dev/null
@@ -0,0 +1,5 @@
+// compile-flags: -Zunstable-options --output-width=10
+#![deny(rustdoc::bare_urls)]
+
+/// This is a long line that contains a http://link.com
+pub struct Foo; //~^ ERROR
diff --git a/src/test/rustdoc-ui/output-width.stderr b/src/test/rustdoc-ui/output-width.stderr
new file mode 100644 (file)
index 0000000..dc79053
--- /dev/null
@@ -0,0 +1,15 @@
+error: this URL is not a hyperlink
+  --> $DIR/output-width.rs:4:41
+   |
+LL | ... a http://link.com
+   |       ^^^^^^^^^^^^^^^ help: use an automatic link instead: `<http://link.com>`
+   |
+note: the lint level is defined here
+  --> $DIR/output-width.rs:2:9
+   |
+LL | ...ny(rustdoc::bare_url...
+   |       ^^^^^^^^^^^^^^^^^^
+   = note: bare URLs are not automatically turned into clickable links
+
+error: aborting due to previous error
+
diff --git a/src/test/rustdoc-ui/terminal-width.rs b/src/test/rustdoc-ui/terminal-width.rs
deleted file mode 100644 (file)
index 72544d7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-// compile-flags: -Zunstable-options --terminal-width=10
-#![deny(rustdoc::bare_urls)]
-
-/// This is a long line that contains a http://link.com
-pub struct Foo; //~^ ERROR
diff --git a/src/test/rustdoc-ui/terminal-width.stderr b/src/test/rustdoc-ui/terminal-width.stderr
deleted file mode 100644 (file)
index 16ab606..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-error: this URL is not a hyperlink
-  --> $DIR/terminal-width.rs:4:41
-   |
-LL | ... a http://link.com
-   |       ^^^^^^^^^^^^^^^ help: use an automatic link instead: `<http://link.com>`
-   |
-note: the lint level is defined here
-  --> $DIR/terminal-width.rs:2:9
-   |
-LL | ...ny(rustdoc::bare_url...
-   |       ^^^^^^^^^^^^^^^^^^
-   = note: bare URLs are not automatically turned into clickable links
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/output-width/flag-human.rs b/src/test/ui/output-width/flag-human.rs
new file mode 100644 (file)
index 0000000..44e9ba0
--- /dev/null
@@ -0,0 +1,9 @@
+// compile-flags: --output-width=20
+
+// This test checks that `-Z output-width` effects the human error output by restricting it to an
+// arbitrarily low value so that the effect is visible.
+
+fn main() {
+    let _: () = 42;
+    //~^ ERROR mismatched types
+}
diff --git a/src/test/ui/output-width/flag-human.stderr b/src/test/ui/output-width/flag-human.stderr
new file mode 100644 (file)
index 0000000..393dcf2
--- /dev/null
@@ -0,0 +1,11 @@
+error[E0308]: mismatched types
+  --> $DIR/flag-human.rs:7:17
+   |
+LL | ..._: () = 42;
+   |       --   ^^ expected `()`, found integer
+   |       |
+   |       expected due to this
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/output-width/flag-json.rs b/src/test/ui/output-width/flag-json.rs
new file mode 100644 (file)
index 0000000..ec01dcb
--- /dev/null
@@ -0,0 +1,9 @@
+// compile-flags: --output-width=20 --error-format=json
+
+// This test checks that `-Z output-width` effects the JSON error output by restricting it to an
+// arbitrarily low value so that the effect is visible.
+
+fn main() {
+    let _: () = 42;
+    //~^ ERROR arguments to this function are incorrect
+}
diff --git a/src/test/ui/output-width/flag-json.stderr b/src/test/ui/output-width/flag-json.stderr
new file mode 100644 (file)
index 0000000..097ca1d
--- /dev/null
@@ -0,0 +1,40 @@
+{"message":"mismatched types","code":{"code":"E0308","explanation":"Expected type did not match the received type.
+
+Erroneous code examples:
+
+```compile_fail,E0308
+fn plus_one(x: i32) -> i32 {
+    x + 1
+}
+
+plus_one(\"Not a number\");
+//       ^^^^^^^^^^^^^^ expected `i32`, found `&str`
+
+if \"Not a bool\" {
+// ^^^^^^^^^^^^ expected `bool`, found `&str`
+}
+
+let x: f32 = \"Not a float\";
+//     ---   ^^^^^^^^^^^^^ expected `f32`, found `&str`
+//     |
+//     expected due to this
+```
+
+This error occurs when an expression was used in a place where the compiler
+expected an expression of a different type. It can occur in several cases, the
+most common being when calling a function and passing an argument which has a
+different type than the matching type in the function declaration.
+"},"level":"error","spans":[{"file_name":"$DIR/flag-json.rs","byte_start":239,"byte_end":241,"line_start":7,"line_end":7,"column_start":17,"column_end":19,"is_primary":true,"text":[{"text":"    let _: () = 42;","highlight_start":17,"highlight_end":19}],"label":"expected `()`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"$DIR/flag-json.rs","byte_start":234,"byte_end":236,"line_start":7,"line_end":7,"column_start":12,"column_end":14,"is_primary":false,"text":[{"text":"    let _: () = 42;","highlight_start":12,"highlight_end":14}],"label":"expected due to this","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0308]: mismatched types
+  --> $DIR/flag-json.rs:7:17
+   |
+LL | ..._: () = 42;
+   |       --   ^^ expected `()`, found integer
+   |       |
+   |       expected due to this
+
+"}
+{"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error
+
+"}
+{"message":"For more information about this error, try `rustc --explain E0308`.","code":null,"level":"failure-note","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0308`.
+"}
diff --git a/src/test/ui/output-width/non-1-width-unicode-multiline-label.rs b/src/test/ui/output-width/non-1-width-unicode-multiline-label.rs
new file mode 100644 (file)
index 0000000..1989ea8
--- /dev/null
@@ -0,0 +1,7 @@
+// ignore-tidy-linelength
+
+fn main() {
+    let unicode_is_fun = "؁‱ஹ௸௵꧄.ဪ꧅⸻𒈙𒐫﷽𒌄𒈟𒍼𒁎𒀱𒌧𒅃 𒈓𒍙𒊎𒄡𒅌𒁏𒀰𒐪𒐩𒈙𒐫𪚥";
+    let _ = "ༀ༁༂༃༄༅༆༇༈༉༊་༌།༎༏༐༑༒༓༔༕༖༗༘༙༚༛༜༝༞༟༠༡༢༣༤༥༦༧༨༩༪༫༬༭༮༯༰༱༲༳༴༵༶༷༸༹༺༻༼༽༾༿ཀཁགགྷངཅཆཇ཈ཉཊཋཌཌྷཎཏཐདདྷནཔཕབབྷམཙཚཛཛྷཝཞཟའཡརལཤཥསཧཨཀྵཪཫཬ཭཮཯཰ཱཱཱིིུུྲྀཷླྀཹེཻོཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇࿈࿉࿊࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun + " really fun!";
+    //~^ ERROR cannot add `&str` to `&str`
+}
diff --git a/src/test/ui/output-width/non-1-width-unicode-multiline-label.stderr b/src/test/ui/output-width/non-1-width-unicode-multiline-label.stderr
new file mode 100644 (file)
index 0000000..bf27736
--- /dev/null
@@ -0,0 +1,18 @@
+error[E0369]: cannot add `&str` to `&str`
+  --> $DIR/non-1-width-unicode-multiline-label.rs:5:260
+   |
+LL | ...ཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇...࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun + " really fun!";
+   |                                                  -------------- ^ -------------- &str
+   |                                                  |              |
+   |                                                  |              `+` cannot be used to concatenate two `&str` strings
+   |                                                  &str
+   |
+   = note: string concatenation requires an owned `String` on the left
+help: create an owned `String` from a string reference
+   |
+LL |     let _ = "ༀ༁༂༃༄༅༆༇༈༉༊་༌།༎༏༐༑༒༓༔༕༖༗༘༙༚༛༜༝༞༟༠༡༢༣༤༥༦༧༨༩༪༫༬༭༮༯༰༱༲༳༴༵༶༷༸༹༺༻༼༽༾༿ཀཁགགྷངཅཆཇ཈ཉཊཋཌཌྷཎཏཐདདྷནཔཕབབྷམཙཚཛཛྷཝཞཟའཡརལཤཥསཧཨཀྵཪཫཬ཭཮཯཰ཱཱཱིིུུྲྀཷླྀཹེཻོཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇࿈࿉࿊࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun.to_owned() + " really fun!";
+   |                                                                                                                                                                                         +++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/output-width/non-whitespace-trimming-2.rs b/src/test/ui/output-width/non-whitespace-trimming-2.rs
new file mode 100644 (file)
index 0000000..abd9e18
--- /dev/null
@@ -0,0 +1,6 @@
+// ignore-tidy-linelength
+
+fn main() {
+    let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let _: usize = 4; let _: usize = 5; let _: usize = 6; let _: usize = 7; let _: usize = 8; let _: usize = 9; let _: usize = 10; let _: usize = 11; let _: usize = 12; let _: usize = 13; let _: usize = 14; let _: usize = 15; let _: () = 42; let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let _: usize = 4; let _: usize = 5; let _: usize = 6; let _: usize = 7; let _: usize = 8; let _: usize = 9; let _: usize = 10; let _: usize = 11; let _: usize = 12; let _: usize = 13; let _: usize = 14; let _: usize = 15;
+//~^ ERROR mismatched types
+}
diff --git a/src/test/ui/output-width/non-whitespace-trimming-2.stderr b/src/test/ui/output-width/non-whitespace-trimming-2.stderr
new file mode 100644 (file)
index 0000000..5dbb9ce
--- /dev/null
@@ -0,0 +1,11 @@
+error[E0308]: mismatched types
+  --> $DIR/non-whitespace-trimming-2.rs:4:311
+   |
+LL | ...13; let _: usize = 14; let _: usize = 15; let _: () = 42; let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let ...
+   |                                                     --   ^^ expected `()`, found integer
+   |                                                     |
+   |                                                     expected due to this
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/output-width/non-whitespace-trimming-unicode.rs b/src/test/ui/output-width/non-whitespace-trimming-unicode.rs
new file mode 100644 (file)
index 0000000..8d4d1b1
--- /dev/null
@@ -0,0 +1,6 @@
+// ignore-tidy-linelength
+
+fn main() {
+    let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀🦀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4"; let _: () = 42;  let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀🦀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4";
+//~^ ERROR mismatched types
+}
diff --git a/src/test/ui/output-width/non-whitespace-trimming-unicode.stderr b/src/test/ui/output-width/non-whitespace-trimming-unicode.stderr
new file mode 100644 (file)
index 0000000..1e5ff93
--- /dev/null
@@ -0,0 +1,11 @@
+error[E0308]: mismatched types
+  --> $DIR/non-whitespace-trimming-unicode.rs:4:415
+   |
+LL | ...♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4"; let _: () = 42;  let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄...
+   |                                            --   ^^ expected `()`, found integer
+   |                                            |
+   |                                            expected due to this
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/output-width/non-whitespace-trimming.rs b/src/test/ui/output-width/non-whitespace-trimming.rs
new file mode 100644 (file)
index 0000000..f6c8d34
--- /dev/null
@@ -0,0 +1,6 @@
+// ignore-tidy-linelength
+
+fn main() {
+    let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = 42; let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = ();
+//~^ ERROR mismatched types
+}
diff --git a/src/test/ui/output-width/non-whitespace-trimming.stderr b/src/test/ui/output-width/non-whitespace-trimming.stderr
new file mode 100644 (file)
index 0000000..c4ff0e1
--- /dev/null
@@ -0,0 +1,11 @@
+error[E0308]: mismatched types
+  --> $DIR/non-whitespace-trimming.rs:4:241
+   |
+LL | ... () = (); let _: () = (); let _: () = (); let _: () = 42; let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = ...
+   |                                                     --   ^^ expected `()`, found integer
+   |                                                     |
+   |                                                     expected due to this
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/output-width/tabs-trimming.rs b/src/test/ui/output-width/tabs-trimming.rs
new file mode 100644 (file)
index 0000000..ade2175
--- /dev/null
@@ -0,0 +1,13 @@
+// Test for #78438: ensure underline alignment with many tabs on the left, long line on the right
+
+// ignore-tidy-linelength
+// ignore-tidy-tab
+
+                                       fn main() {
+                                               let money = 42i32;
+                                               match money {
+                                                       v @ 1 | 2 | 3 => panic!("You gave me too little money {}", v), // Long text here: TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
+                                                       //~^ ERROR variable `v` is not bound in all patterns
+                                                       v => println!("Enough money {}", v),
+                                               }
+                                       }
diff --git a/src/test/ui/output-width/tabs-trimming.stderr b/src/test/ui/output-width/tabs-trimming.stderr
new file mode 100644 (file)
index 0000000..6c8d9af
--- /dev/null
@@ -0,0 +1,12 @@
+error[E0408]: variable `v` is not bound in all patterns
+  --> $DIR/tabs-trimming.rs:9:16
+   |
+LL | ...   v @ 1 | 2 | 3 => panic!("You gave me too little money {}", v), // Long text here: TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT...
+   |       -       ^   ^ pattern doesn't bind `v`
+   |       |       |
+   |       |       pattern doesn't bind `v`
+   |       variable not in all patterns
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/output-width/whitespace-trimming-2.rs b/src/test/ui/output-width/whitespace-trimming-2.rs
new file mode 100644 (file)
index 0000000..c68f678
--- /dev/null
@@ -0,0 +1,8 @@
+// ignore-tidy-linelength
+
+fn foo() -> usize {
+                                                                                                                                                                                          ()
+//~^ ERROR mismatched types
+}
+
+fn main() {}
diff --git a/src/test/ui/output-width/whitespace-trimming-2.stderr b/src/test/ui/output-width/whitespace-trimming-2.stderr
new file mode 100644 (file)
index 0000000..97a64e6
--- /dev/null
@@ -0,0 +1,11 @@
+error[E0308]: mismatched types
+  --> $DIR/whitespace-trimming-2.rs:4:187
+   |
+LL | ...-> usize {
+   |       ----- expected `usize` because of return type
+LL | ...                                                                                                                                                                                 ()
+   |                                                                                                                                                                                     ^^ expected `usize`, found `()`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/output-width/whitespace-trimming.rs b/src/test/ui/output-width/whitespace-trimming.rs
new file mode 100644 (file)
index 0000000..f747bcf
--- /dev/null
@@ -0,0 +1,6 @@
+// ignore-tidy-linelength
+
+fn main() {
+                                                                                                                                                                                    let _: () = 42;
+//~^ ERROR mismatched types
+}
diff --git a/src/test/ui/output-width/whitespace-trimming.stderr b/src/test/ui/output-width/whitespace-trimming.stderr
new file mode 100644 (file)
index 0000000..e296d48
--- /dev/null
@@ -0,0 +1,11 @@
+error[E0308]: mismatched types
+  --> $DIR/whitespace-trimming.rs:4:193
+   |
+LL | ...                   let _: () = 42;
+   |                              --   ^^ expected `()`, found integer
+   |                              |
+   |                              expected due to this
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/terminal-width/flag-human.rs b/src/test/ui/terminal-width/flag-human.rs
deleted file mode 100644 (file)
index 4ae960e..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: --terminal-width=20
-
-// This test checks that `-Z terminal-width` effects the human error output by restricting it to an
-// arbitrarily low value so that the effect is visible.
-
-fn main() {
-    let _: () = 42;
-    //~^ ERROR mismatched types
-}
diff --git a/src/test/ui/terminal-width/flag-human.stderr b/src/test/ui/terminal-width/flag-human.stderr
deleted file mode 100644 (file)
index 393dcf2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/flag-human.rs:7:17
-   |
-LL | ..._: () = 42;
-   |       --   ^^ expected `()`, found integer
-   |       |
-   |       expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/terminal-width/flag-json.rs b/src/test/ui/terminal-width/flag-json.rs
deleted file mode 100644 (file)
index d4e51e8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-// compile-flags: --terminal-width=20 --error-format=json
-
-// This test checks that `-Z terminal-width` effects the JSON error output by restricting it to an
-// arbitrarily low value so that the effect is visible.
-
-fn main() {
-    let _: () = 42;
-    //~^ ERROR arguments to this function are incorrect
-}
diff --git a/src/test/ui/terminal-width/flag-json.stderr b/src/test/ui/terminal-width/flag-json.stderr
deleted file mode 100644 (file)
index b21391d..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-{"message":"mismatched types","code":{"code":"E0308","explanation":"Expected type did not match the received type.
-
-Erroneous code examples:
-
-```compile_fail,E0308
-fn plus_one(x: i32) -> i32 {
-    x + 1
-}
-
-plus_one(\"Not a number\");
-//       ^^^^^^^^^^^^^^ expected `i32`, found `&str`
-
-if \"Not a bool\" {
-// ^^^^^^^^^^^^ expected `bool`, found `&str`
-}
-
-let x: f32 = \"Not a float\";
-//     ---   ^^^^^^^^^^^^^ expected `f32`, found `&str`
-//     |
-//     expected due to this
-```
-
-This error occurs when an expression was used in a place where the compiler
-expected an expression of a different type. It can occur in several cases, the
-most common being when calling a function and passing an argument which has a
-different type than the matching type in the function declaration.
-"},"level":"error","spans":[{"file_name":"$DIR/flag-json.rs","byte_start":243,"byte_end":245,"line_start":7,"line_end":7,"column_start":17,"column_end":19,"is_primary":true,"text":[{"text":"    let _: () = 42;","highlight_start":17,"highlight_end":19}],"label":"expected `()`, found integer","suggested_replacement":null,"suggestion_applicability":null,"expansion":null},{"file_name":"$DIR/flag-json.rs","byte_start":238,"byte_end":240,"line_start":7,"line_end":7,"column_start":12,"column_end":14,"is_primary":false,"text":[{"text":"    let _: () = 42;","highlight_start":12,"highlight_end":14}],"label":"expected due to this","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"error[E0308]: mismatched types
-  --> $DIR/flag-json.rs:7:17
-   |
-LL | ..._: () = 42;
-   |       --   ^^ expected `()`, found integer
-   |       |
-   |       expected due to this
-
-"}
-{"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error
-
-"}
-{"message":"For more information about this error, try `rustc --explain E0308`.","code":null,"level":"failure-note","spans":[],"children":[],"rendered":"For more information about this error, try `rustc --explain E0308`.
-"}
diff --git a/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.rs b/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.rs
deleted file mode 100644 (file)
index 1989ea8..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let unicode_is_fun = "؁‱ஹ௸௵꧄.ဪ꧅⸻𒈙𒐫﷽𒌄𒈟𒍼𒁎𒀱𒌧𒅃 𒈓𒍙𒊎𒄡𒅌𒁏𒀰𒐪𒐩𒈙𒐫𪚥";
-    let _ = "ༀ༁༂༃༄༅༆༇༈༉༊་༌།༎༏༐༑༒༓༔༕༖༗༘༙༚༛༜༝༞༟༠༡༢༣༤༥༦༧༨༩༪༫༬༭༮༯༰༱༲༳༴༵༶༷༸༹༺༻༼༽༾༿ཀཁགགྷངཅཆཇ཈ཉཊཋཌཌྷཎཏཐདདྷནཔཕབབྷམཙཚཛཛྷཝཞཟའཡརལཤཥསཧཨཀྵཪཫཬ཭཮཯཰ཱཱཱིིུུྲྀཷླྀཹེཻོཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇࿈࿉࿊࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun + " really fun!";
-    //~^ ERROR cannot add `&str` to `&str`
-}
diff --git a/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.stderr b/src/test/ui/terminal-width/non-1-width-unicode-multiline-label.stderr
deleted file mode 100644 (file)
index bf27736..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-error[E0369]: cannot add `&str` to `&str`
-  --> $DIR/non-1-width-unicode-multiline-label.rs:5:260
-   |
-LL | ...ཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇...࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun + " really fun!";
-   |                                                  -------------- ^ -------------- &str
-   |                                                  |              |
-   |                                                  |              `+` cannot be used to concatenate two `&str` strings
-   |                                                  &str
-   |
-   = note: string concatenation requires an owned `String` on the left
-help: create an owned `String` from a string reference
-   |
-LL |     let _ = "ༀ༁༂༃༄༅༆༇༈༉༊་༌།༎༏༐༑༒༓༔༕༖༗༘༙༚༛༜༝༞༟༠༡༢༣༤༥༦༧༨༩༪༫༬༭༮༯༰༱༲༳༴༵༶༷༸༹༺༻༼༽༾༿ཀཁགགྷངཅཆཇ཈ཉཊཋཌཌྷཎཏཐདདྷནཔཕབབྷམཙཚཛཛྷཝཞཟའཡརལཤཥསཧཨཀྵཪཫཬ཭཮཯཰ཱཱཱིིུུྲྀཷླྀཹེཻོཽཾཿ྄ཱྀྀྂྃ྅྆྇ྈྉྊྋྌྍྎྏྐྑྒྒྷྔྕྖྗ྘ྙྚྛྜྜྷྞྟྠྡྡྷྣྤྥྦྦྷྨྩྪྫྫྷྭྮྯྰྱྲླྴྵྶྷྸྐྵྺྻྼ྽྾྿࿀࿁࿂࿃࿄࿅࿆࿇࿈࿉࿊࿋࿌࿍࿎࿏࿐࿑࿒࿓࿔࿕࿖࿗࿘࿙࿚"; let _a = unicode_is_fun.to_owned() + " really fun!";
-   |                                                                                                                                                                                         +++++++++++
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0369`.
diff --git a/src/test/ui/terminal-width/non-whitespace-trimming-2.rs b/src/test/ui/terminal-width/non-whitespace-trimming-2.rs
deleted file mode 100644 (file)
index abd9e18..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let _: usize = 4; let _: usize = 5; let _: usize = 6; let _: usize = 7; let _: usize = 8; let _: usize = 9; let _: usize = 10; let _: usize = 11; let _: usize = 12; let _: usize = 13; let _: usize = 14; let _: usize = 15; let _: () = 42; let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let _: usize = 4; let _: usize = 5; let _: usize = 6; let _: usize = 7; let _: usize = 8; let _: usize = 9; let _: usize = 10; let _: usize = 11; let _: usize = 12; let _: usize = 13; let _: usize = 14; let _: usize = 15;
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/terminal-width/non-whitespace-trimming-2.stderr b/src/test/ui/terminal-width/non-whitespace-trimming-2.stderr
deleted file mode 100644 (file)
index 5dbb9ce..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/non-whitespace-trimming-2.rs:4:311
-   |
-LL | ...13; let _: usize = 14; let _: usize = 15; let _: () = 42; let _: usize = 0; let _: usize = 1; let _: usize = 2; let _: usize = 3; let ...
-   |                                                     --   ^^ expected `()`, found integer
-   |                                                     |
-   |                                                     expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/terminal-width/non-whitespace-trimming-unicode.rs b/src/test/ui/terminal-width/non-whitespace-trimming-unicode.rs
deleted file mode 100644 (file)
index 8d4d1b1..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀🦀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4"; let _: () = 42;  let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4🦀🦀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄♅♆♇♏♔♕♖♗♘♙♚♛♜♝♞♟♠♡♢♣♤♥♦♧♨♩♪♫♬♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4";
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/terminal-width/non-whitespace-trimming-unicode.stderr b/src/test/ui/terminal-width/non-whitespace-trimming-unicode.stderr
deleted file mode 100644 (file)
index 1e5ff93..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/non-whitespace-trimming-unicode.rs:4:415
-   |
-LL | ...♭♮♯♰♱♲♳♴♵♶♷♸♹♺♻♼♽♾♿⚀⚁⚂⚃⚄⚅⚆⚈⚉4"; let _: () = 42;  let _: &str = "🦀☀☁☂☃☄★☆☇☈☉☊☋☌☍☎☏☐☑☒☓  ☖☗☘☙☚☛☜☝☞☟☠☡☢☣☤☥☦☧☨☩☪☫☬☭☮☯☰☱☲☳☴☵☶☷☸☹☺☻☼☽☾☿♀♁♂♃♄...
-   |                                            --   ^^ expected `()`, found integer
-   |                                            |
-   |                                            expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/terminal-width/non-whitespace-trimming.rs b/src/test/ui/terminal-width/non-whitespace-trimming.rs
deleted file mode 100644 (file)
index f6c8d34..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-    let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = 42; let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = ();
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/terminal-width/non-whitespace-trimming.stderr b/src/test/ui/terminal-width/non-whitespace-trimming.stderr
deleted file mode 100644 (file)
index c4ff0e1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/non-whitespace-trimming.rs:4:241
-   |
-LL | ... () = (); let _: () = (); let _: () = (); let _: () = 42; let _: () = (); let _: () = (); let _: () = (); let _: () = (); let _: () = ...
-   |                                                     --   ^^ expected `()`, found integer
-   |                                                     |
-   |                                                     expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/terminal-width/tabs-trimming.rs b/src/test/ui/terminal-width/tabs-trimming.rs
deleted file mode 100644 (file)
index ade2175..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-// Test for #78438: ensure underline alignment with many tabs on the left, long line on the right
-
-// ignore-tidy-linelength
-// ignore-tidy-tab
-
-                                       fn main() {
-                                               let money = 42i32;
-                                               match money {
-                                                       v @ 1 | 2 | 3 => panic!("You gave me too little money {}", v), // Long text here: TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT
-                                                       //~^ ERROR variable `v` is not bound in all patterns
-                                                       v => println!("Enough money {}", v),
-                                               }
-                                       }
diff --git a/src/test/ui/terminal-width/tabs-trimming.stderr b/src/test/ui/terminal-width/tabs-trimming.stderr
deleted file mode 100644 (file)
index 6c8d9af..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0408]: variable `v` is not bound in all patterns
-  --> $DIR/tabs-trimming.rs:9:16
-   |
-LL | ...   v @ 1 | 2 | 3 => panic!("You gave me too little money {}", v), // Long text here: TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT...
-   |       -       ^   ^ pattern doesn't bind `v`
-   |       |       |
-   |       |       pattern doesn't bind `v`
-   |       variable not in all patterns
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/terminal-width/whitespace-trimming-2.rs b/src/test/ui/terminal-width/whitespace-trimming-2.rs
deleted file mode 100644 (file)
index c68f678..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-// ignore-tidy-linelength
-
-fn foo() -> usize {
-                                                                                                                                                                                          ()
-//~^ ERROR mismatched types
-}
-
-fn main() {}
diff --git a/src/test/ui/terminal-width/whitespace-trimming-2.stderr b/src/test/ui/terminal-width/whitespace-trimming-2.stderr
deleted file mode 100644 (file)
index 97a64e6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/whitespace-trimming-2.rs:4:187
-   |
-LL | ...-> usize {
-   |       ----- expected `usize` because of return type
-LL | ...                                                                                                                                                                                 ()
-   |                                                                                                                                                                                     ^^ expected `usize`, found `()`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/terminal-width/whitespace-trimming.rs b/src/test/ui/terminal-width/whitespace-trimming.rs
deleted file mode 100644 (file)
index f747bcf..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-// ignore-tidy-linelength
-
-fn main() {
-                                                                                                                                                                                    let _: () = 42;
-//~^ ERROR mismatched types
-}
diff --git a/src/test/ui/terminal-width/whitespace-trimming.stderr b/src/test/ui/terminal-width/whitespace-trimming.stderr
deleted file mode 100644 (file)
index e296d48..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/whitespace-trimming.rs:4:193
-   |
-LL | ...                   let _: () = 42;
-   |                              --   ^^ expected `()`, found integer
-   |                              |
-   |                              expected due to this
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.