Uh oh!
There was an error while loading. Please reload this page.
Tweak multispan rendering to reduce output length - #134181
Conversation
rustbot
commented
Dec 11, 2024
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
rustbot
commented
Dec 11, 2024
rustbot has assigned @petrochenkov. Use |
This comment has been minimized.
This comment has been minimized.
Consider comments and bare delimiters the same as an "empty line" for purposes of hiding rendered code output of long multispans. This results in more aggressive shortening of rendered output without losing too much context, specially in `*.stderr` tests that have "hidden" comments.
…tiline span rendering
rustbot
commented
Dec 12, 2024
The Miri subtree was changed cc @rust-lang/miri |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
estebank
commented
Dec 13, 2024
I don't have access to a windows machine to fix that miri test, and the log that's being printed by CI doesn't really make sense, so I'll have to try a few different things to see what |
oli-obk
commented
Dec 13, 2024
Ah, you can usually just bless with |
estebank
commented
Dec 13, 2024
The issue is with this https://github.com/rust-lang/rust/blob/7d9a4a7d3a4ae6298f3aed697dffaaf379308983/src/tools/miri/tests/fail-dep/concurrency/windows_join_self.rs and https://github.com/rust-lang/rust/blob/7d9a4a7d3a4ae6298f3aed697dffaaf379308983/src/tools/miri/tests/fail-dep/concurrency/windows_join_main.rs, which I think have the dependency on |
Don't consider `///` and `//!` docstrings to be empty for the purposes of multiline span rendering.
Yeah I do that all the time, it even runs on CI.
It will handle that automatically. You may notice that the test runner that reported the failure here is a Linux runner. :) |
estebank
commented
Dec 13, 2024
Ended up getting it right by "blind editing" (by making an expression that kind of looked the same physically as far as spans go to see what the new rendering looked like and going off that). @bors r=oli-obk |
bors
commented
Dec 13, 2024
Tweak multispan rendering to reduce output length Consider comments and bare delimiters the same as an "empty line" for purposes of hiding rendered code output of long multispans. This results in more aggressive shortening of rendered output without losing too much context, specially in `*.stderr` tests that have "hidden" comments. We do that check not only on the first 4 lines of the multispan, but now also on the previous to last line as well.
Tweak multispan rendering to reduce output length Consider comments and bare delimiters the same as an "empty line" for purposes of hiding rendered code output of long multispans. This results in more aggressive shortening of rendered output without losing too much context, specially in `*.stderr` tests that have "hidden" comments. We do that check not only on the first 4 lines of the multispan, but now also on the previous to last line as well.
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#134181 (Tweak multispan rendering to reduce output length) - rust-lang#134209 (validate `--skip` and `--exclude` paths) - rust-lang#134231 (rustdoc-search: fix mismatched path when parent re-exported twice) - rust-lang#134236 (crashes: more tests v2) - rust-lang#134240 (Only dist `llvm-objcopy` if llvm tools are enabled) - rust-lang#134244 (rustc_borrowck: Stop suggesting the invalid syntax `&mut raw const`) - rust-lang#134251 (A bunch of cleanups (part 2)) - rust-lang#134256 (Use a more precise span in placeholder_type_error_diag) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#134181 - estebank:trim-render, r=oli-obk Tweak multispan rendering to reduce output length Consider comments and bare delimiters the same as an "empty line" for purposes of hiding rendered code output of long multispans. This results in more aggressive shortening of rendered output without losing too much context, specially in `*.stderr` tests that have "hidden" comments. We do that check not only on the first 4 lines of the multispan, but now also on the previous to last line as well.
Tweak multispan rendering to reduce output length Consider comments and bare delimiters the same as an "empty line" for purposes of hiding rendered code output of long multispans. This results in more aggressive shortening of rendered output without losing too much context, specially in `*.stderr` tests that have "hidden" comments. We do that check not only on the first 4 lines of the multispan, but now also on the previous to last line as well.
Consider comments and bare delimiters the same as an "empty line" for purposes of hiding rendered code output of long multispans. This results in more aggressive shortening of rendered output without losing too much context, specially in
*.stderrtests that have "hidden" comments. We do that check not only on the first 4 lines of the multispan, but now also on the previous to last line as well.