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.

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

Outdent example, preserving nested fence #60207

Merged
merged 1 commit into from
May 17, 2019
Merged

Conversation

felixrabe
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @frewsxcv

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 23, 2019
@felixrabe
Copy link
Contributor Author

Still waiting for a local ./x.py doc to produce a result... First time actually running that script, I thought it would just build the docs :/

@felixrabe
Copy link
Contributor Author

r? @steveklabnik

@felixrabe
Copy link
Contributor Author

./x.py doc finished in ~45 min. Local build/x86_64-apple-darwin/doc/rustdoc/what-is-rustdoc.html looks fine.

@steveklabnik
Copy link
Member

Can you show me a screenshot? I'm surprised this works, though maybe that's because this was written before we used pulldown-cmark, and it can handle it.

@felixrabe
Copy link
Contributor Author

felixrabe commented Apr 24, 2019

The CommonMark spec allows for nested fenced code blocks by requiring the same amount ({3,}) of opening and closing `'s or ~'s: https://spec.commonmark.org/0.29/#fenced-code-blocks.

So this is how the proposed change renders for me:

Screen Shot 2019-04-24 at 13 09 09

And this is the exactly same code (from ````text to ````), inlined in this comment:

# Docs

This is a project to test out `rustdoc`.

[Here is a link!](https://www.rust-lang.org)

## Subheading

```rust
fn foo() -> i32 {
    1 + 1
}
```

@felixrabe
Copy link
Contributor Author

Btw, to render ````text or ` in Markdown as I did above, use double backticks and a space around the code, e.g.:

`` ````text ``

and

`` ` ``

(Found by looking at https://spec.commonmark.org/0.29/changes.html#part-7.)

@Dylan-DPC-zz
Copy link

ping from triage @steveklabnik any updates?

@steveklabnik
Copy link
Member

@bors: r+ rollup

sorry for taking so long here!

@bors
Copy link
Contributor

bors commented May 16, 2019

📌 Commit 2823475 has been approved by steveklabnik

@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 May 16, 2019
Manishearth added a commit to Manishearth/rust that referenced this pull request May 16, 2019
Outdent example, preserving nested fence
bors added a commit that referenced this pull request May 16, 2019
Rollup of 5 pull requests

Successful merges:

 - #60207 (Outdent example, preserving nested fence)
 - #60278 (Document the `html_root_url` doc attribute value.)
 - #60597 (Do some simple constant propagation in the ConstProp pass)
 - #60837 (Update release notes for 1.35.0)
 - #60887 (Update clippy)

Failed merges:

r? @ghost
@bors bors merged commit 2823475 into rust-lang:master May 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants