Skip to content
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

Fix rustdoc test ICE #48382

Merged
merged 1 commit into from
Feb 22, 2018
Merged

Fix rustdoc test ICE #48382

merged 1 commit into from
Feb 22, 2018

Conversation

GuillaumeGomez
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2018
@estebank
Copy link
Contributor

r=me once travis passes

Shouldn't this provide a warning?

@GuillaumeGomez
Copy link
Member Author

@estebank: Hum not sure...

@bors: r=estebank

@bors
Copy link
Contributor

bors commented Feb 20, 2018

📌 Commit 5cbf9ae has been approved by estebank

@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 Feb 20, 2018
@QuietMisdreavus
Copy link
Member

What's the process for nominating for beta backport? This ICE is currently in beta as well.

@estebank
Copy link
Contributor

@QuietMisdreavus https://forge.rust-lang.org/beta-backporting.html

@QuietMisdreavus QuietMisdreavus added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 21, 2018
@QuietMisdreavus
Copy link
Member

@estebank Thanks!

Nominating for beta backport. The included test ICEs on rustdoc 1.25.0-beta.2 (1e8fbb143 2018-02-19)

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Feb 21, 2018
@GuillaumeGomez
Rollup merge of rust-lang#48382 - GuillaumeGomez:fix-rustdoc-test-pan…
c118d37 
…ic, r=estebank

Fix rustdoc test ICE

Fixes rust-lang#48377.

r? @QuietMisdreavus
@GuillaumeGomez GuillaumeGomez mentioned this pull request Feb 21, 2018
Merged
bors added a commit that referenced this pull request Feb 22, 2018
@bors
Auto merge of #48399 - GuillaumeGomez:rollup, r=GuillaumeGomez
b1f8e6f 
Rollup of 12 pull requests

- Successful merges: #47379, #47833, #48106, #48198, #48314, #48325, #48335, #48352, #48354, #48360, #48382, #48397
- Failed merges:
@bors bors merged commit 5cbf9ae into rust-lang:master Feb 22, 2018
@GuillaumeGomez GuillaumeGomez deleted the fix-rustdoc-test-panic branch February 22, 2018 15:03
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Feb 22, 2018
@nikomatsakis
Copy link
Contributor

Accepting for backport, though I'm not sure which team is responsible. cc @rust-lang/docs

@frewsxcv frewsxcv mentioned this pull request Feb 23, 2018
Merged
@frewsxcv
Copy link
Member

beta backport pr: #48454

bors added a commit that referenced this pull request Feb 27, 2018
@bors
Auto merge of #48454 - frewsxcv:frewsxcv-backport, r=QuietMisdreavus
ed61aaa 
[beta] Backport "Fix rustdoc test ICE"

#48382
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 27, 2018
@GuillaumeGomez GuillaumeGomez mentioned this pull request Feb 28, 2018
Merged
kennytm added a commit to kennytm/rust that referenced this pull request Mar 21, 2018
@kennytm
Rollup merge of rust-lang#48596 - GuillaumeGomez:invalid-code-block-s…
82e2f36 
…tart, r=QuietMisdreavus

Add warning for invalid start of code blocks in rustdoc

Follow up of rust-lang#48382.

Still two things to consider:
 1. Adding test for rustdoc output (but where? In UI or in rustdoc tests?).
 2. Try to fix the span issue.

r? @QuietMisdreavus
kennytm added a commit to kennytm/rust that referenced this pull request Mar 22, 2018
@kennytm
Rollup merge of rust-lang#48596 - GuillaumeGomez:invalid-code-block-s…
a848336 
…tart, r=QuietMisdreavus

Add warning for invalid start of code blocks in rustdoc

Follow up of rust-lang#48382.

Still two things to consider:
 1. Adding test for rustdoc output (but where? In UI or in rustdoc tests?).
 2. Try to fix the span issue.

r? @QuietMisdreavus
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@QuietMisdreavus QuietMisdreavus

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@GuillaumeGomez @estebank @bors @QuietMisdreavus @nikomatsakis @frewsxcv @alexcrichton @rust-highfive