Skip to content

Rollup of 3 pull requests #79092

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

Jump to bottom
Closed
wants to merge 15 commits into from
Closed

Rollup of 3 pull requests #79092

wants to merge 15 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomez and others added 15 commits November 15, 2020 16:11
@GuillaumeGomez
Ensure that the source code display is working with DOS backline
1861a38
@RalfJung
document that __rust_alloc is also magic to our LLVM fork
af869c2
@GuillaumeGomez
Add test to ensure that no DOS backline (\r\n) doesn't create extra b…
0c52044 
…ackline in source rendering
@GuillaumeGomez
Add color in rustdoc --test output
9d59f5e
@GuillaumeGomez
Update error code detection in compile_fail doctests
3bfa4f9
@GuillaumeGomez
Add check to get windows console type to decide to use colors or not
3e1f8a8
@GuillaumeGomez
Update lock file
a102ec0
@GuillaumeGomez
Simplfy color availability check
329d5fa
@GuillaumeGomez
Update doctest tests
1ee6308
@GuillaumeGomez
Correctly detect color support
494e452
@GuillaumeGomez
Add comment explaining why we can't split on error[{}]: because of…
2edc3bd 
… the color escape characters
@GuillaumeGomez
Remove unused import
bdcd6da
@GuillaumeGomez
Rollup merge of rust-lang#74293 - GuillaumeGomez:rustdoc-test-compile…
a06fb3c 
…r-output-color, r=jyn514

Rustdoc test compiler output color

Fixes rust-lang#72915

We just need to be sure it doesn't break rustdoc doctests' compilation checks. Maybe some other unforeseen consequences too?

r? ``@ehuss``
cc ``@rust-lang/rustdoc``
@GuillaumeGomez
Rollup merge of rust-lang#77939 - GuillaumeGomez:fix-source-code-dos-…
4882110 
…backline, r=jyn514

Ensure that the source code display is working with DOS backline

Fixes rust-lang#76361.

cc ``@lzutao``
r? ``@jyn514``
@GuillaumeGomez
Rollup merge of rust-lang#79077 - RalfJung:llvm-magic, r=Mark-Simulacrum
9c509d7 
document that __rust_alloc is also magic to our LLVM fork

Based on [comments](rust-lang#79045 (comment)) by ``@tmiasko`` and ``@bjorn3.``
@rustbot rustbot added the rollup A PR which is a rollup label Nov 16, 2020
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=3

@bors
Copy link
Collaborator

bors commented Nov 16, 2020

📌 Commit 9c509d7 has been approved by GuillaumeGomez

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 16, 2020
@bors
Copy link
Collaborator

bors commented Nov 16, 2020

⌛ Testing commit 9c509d7 with merge 4e4fcc376bd1bbb6f6d273cbc395a5153afe8e84...

@bors
Copy link
Collaborator

bors commented Nov 16, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 16, 2020
@GuillaumeGomez
Copy link
Member Author

Anyone knows about this:

---- [debuginfo-lldb] debuginfo/pretty-std-collections.rs stdout ----
NOTE: compiletest thinks it is using LLDB version 1200
NOTE: compiletest thinks it is using LLDB without native rust support

error: Error while running LLDB

?

@GuillaumeGomez
Copy link
Member Author

#78665

@bors: retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 16, 2020
@bors
Copy link
Collaborator

bors commented Nov 16, 2020

⌛ Testing commit 9c509d7 with merge ad95fd60ca6840ecb283e898f7cb7a348c40390d...

@bors
Copy link
Collaborator

bors commented Nov 16, 2020

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 16, 2020
@GuillaumeGomez GuillaumeGomez deleted the rollup-sok7rfu branch November 16, 2020 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuillaumeGomez @bors @rustbot @RalfJung