Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #79081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 19 commits into from
Closed

Rollup of 5 pull requests #79081

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6728240
Test structural matching for all range types
CDirkx Nov 7, 2020
c34350a
Add tests and improve rendering of features on traits
Nemo157 Nov 2, 2020
1861a38
Ensure that the source code display is working with DOS backline
GuillaumeGomez Oct 14, 2020
af869c2
document that __rust_alloc is also magic to our LLVM fork
RalfJung Nov 15, 2020
0c52044
Add test to ensure that no DOS backline (\r\n) doesn't create extra b…
GuillaumeGomez Nov 15, 2020
9d59f5e
Add color in rustdoc --test output
GuillaumeGomez Jul 13, 2020
3bfa4f9
Update error code detection in compile_fail doctests
GuillaumeGomez Jul 14, 2020
3e1f8a8
Add check to get windows console type to decide to use colors or not
GuillaumeGomez Jul 16, 2020
a102ec0
Update lock file
GuillaumeGomez Jul 16, 2020
329d5fa
Simplfy color availability check
GuillaumeGomez Nov 11, 2020
1ee6308
Update doctest tests
GuillaumeGomez Nov 11, 2020
494e452
Correctly detect color support
GuillaumeGomez Nov 12, 2020
2edc3bd
Add comment explaining why we can't split on `error[{}]: ` because of…
GuillaumeGomez Nov 13, 2020
bdcd6da
Remove unused import
GuillaumeGomez Nov 15, 2020
00b594b
Rollup merge of #74293 - GuillaumeGomez:rustdoc-test-compiler-output-…
GuillaumeGomez Nov 15, 2020
6a3473f
Rollup merge of #76339 - CDirkx:structural-match-range, r=Mark-Simula…
GuillaumeGomez Nov 15, 2020
a3eaa85
Rollup merge of #77939 - GuillaumeGomez:fix-source-code-dos-backline,…
GuillaumeGomez Nov 15, 2020
f0965d5
Rollup merge of #78678 - Nemo157:doc-cfg-w-traits, r=jyn514,Guillaume…
GuillaumeGomez Nov 15, 2020
7d7411a
Rollup merge of #79077 - RalfJung:llvm-magic, r=Mark-Simulacrum
GuillaumeGomez Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add comment explaining why we can't split on error[{}]: because of… 
… the color escape characters
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Nov 15, 2020
commit 2edc3bdaab6e2d3a85de612507e832623962ff9c
3 changes: 3 additions & 0 deletions src/librustdoc/doctest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,9 @@ fn run_test(
(true, false) => {}
(false, true) => {
if !error_codes.is_empty() {
// We used to check if the output contained "error[{}]: " but since we added the
// colored output, we can't anymore because of the color escape characters before
// the ":".
error_codes.retain(|err| !out.contains(&format!("error[{}]", err)));

if !error_codes.is_empty() {
Expand Down