Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Make internal docs build properly. #46979

Merged
merged 1 commit into from
Dec 26, 2017
Merged

Make internal docs build properly. #46979

merged 1 commit into from
Dec 26, 2017

Conversation

clarfonthey
Copy link
Contributor

'1 isn't a valid lifetime and resulted in a syntax error.

@rust-highfive
Copy link
Collaborator

r? @arielb1

(rust_highfive has picked a reviewer for you, use r? to override)

@kennytm
Copy link
Member

kennytm commented Dec 24, 2017

Since MIR is not valid Rust, I think it is better just make them ```text to avoid parsing these code blocks at all.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 24, 2017
@clarfonthey
Copy link
Contributor Author

Yeah, that's fair. I'll update it, then.

@arielb1
Copy link
Contributor

arielb1 commented Dec 25, 2017

r? @petrochenkov

Please use '```text'

@clarfonthey
Copy link
Contributor Author

Done!

@arielb1
Copy link
Contributor

arielb1 commented Dec 25, 2017

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 25, 2017

📌 Commit 8e80c57 has been approved by arielb1

@bors
Copy link
Contributor

bors commented Dec 26, 2017

⌛ Testing commit 8e80c57 with merge cba162d32b848537c41346ef353961a7b56fcab8...

@bors
Copy link
Contributor

bors commented Dec 26, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Dec 26, 2017

@bors retry #47002

kennytm added a commit to kennytm/rust that referenced this pull request Dec 26, 2017
@kennytm
Rollup merge of rust-lang#46979 - clarcharr:rustc_docs, r=arielb1
c1d2eca 
Make internal docs build properly.

`'1` isn't a valid lifetime and resulted in a syntax error.
@kennytm kennytm mentioned this pull request Dec 26, 2017
Merged
bors added a commit that referenced this pull request Dec 26, 2017
@bors
Auto merge of #47012 - kennytm:rollup, r=kennytm
8cdde6d 
Rollup of 8 pull requests

- Successful merges: #46928, #46930, #46933, #46939, #46940, #46943, #46979, #46986
- Failed merges:
@bors bors merged commit 8e80c57 into rust-lang:master Dec 26, 2017
@clarfonthey clarfonthey mentioned this pull request Dec 26, 2017
Closed
@clarfonthey clarfonthey deleted the rustc_docs branch May 5, 2018 04:33
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
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.
6 participants
@clarfonthey @rust-highfive @kennytm @arielb1 @bors @petrochenkov