Skip to content

Make internal docs build properly. - #46979

Merged
bors merged 1 commit into
rust-lang:masterfrom
clarfonthey:rustc_docs
Dec 26, 2017
Merged

Make internal docs build properly.#46979
bors merged 1 commit into
rust-lang:masterfrom
clarfonthey:rustc_docs

Conversation

@clarfonthey

@clarfontheyclarfonthey commented Dec 24, 2017

Copy link
Copy Markdown
Contributor

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

@rust-highfive

rust-highfive commented Dec 24, 2017

Copy link
Copy Markdown
Contributor

r? @arielb1

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

@kennytm

kennytm commented Dec 24, 2017

Copy link
Copy Markdown
Member

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

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

clarfonthey commented Dec 25, 2017

Copy link
Copy Markdown
ContributorAuthor

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

@arielb1

arielb1 commented Dec 25, 2017

Copy link
Copy Markdown
Contributor

r? @petrochenkov

Please use '```text'

@clarfonthey

clarfonthey commented Dec 25, 2017

Copy link
Copy Markdown
ContributorAuthor

Done!

@arielb1

arielb1 commented Dec 25, 2017

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Dec 25, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 8e80c57 has been approved by arielb1

@bors

bors commented Dec 26, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8e80c57 with merge cba162d32b848537c41346ef353961a7b56fcab8...

@bors

bors commented Dec 26, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@kennytm

kennytm commented Dec 26, 2017

Copy link
Copy Markdown
Member

@bors retry #47002

kennytm added a commit to kennytm/rust that referenced this pull request Dec 26, 2017
@kennytm
Rollup merge ofrust-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.
@kennytmkennytm 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:masterDec 26, 2017
@clarfontheyclarfonthey mentioned this pull request Dec 26, 2017
Closed
@clarfonthey
clarfonthey deleted the rustc_docs branch May 5, 2018 04:33
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@petrochenkovpetrochenkov

Labels

S-waiting-on-reviewStatus: 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