Skip to content

Split rustdoc summary lines in a smarter way - #23351

Merged
bors merged 1 commit into
rust-lang:masterfrom
nagisa:rustdoc-lines-2
Mar 15, 2015
Merged

Split rustdoc summary lines in a smarter way#23351
bors merged 1 commit into
rust-lang:masterfrom
nagisa:rustdoc-lines-2

Conversation

@nagisa

@nagisa nagisa commented Mar 13, 2015

Copy link
Copy Markdown
Member

Previously it would fail on a trivial case like

/// Summary line
/// <trailing space>
/// Regular content

Compliant markdown preprocessor would render that as two separate paragraphs, but our summary line
extractor interprets both lines as the same paragraph and includes both into the short summary resulting in
screenshot from 2015-03-13 22 47 08

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @pcwalton

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

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ 42ac4a7

Comment thread src/librustdoc/html/render.rs Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: x -> line?

Previously it would fail on a trivial case like

    /// Summary line
    /// <trailing space>
    /// Regular content

Compliant markdown preprocessor would render that as two separate paragraphs, but our summary line
extractor would interpret both lines as the same paragraph and include both into the short summary.
@nagisa

nagisa commented Mar 14, 2015

Copy link
Copy Markdown
Member Author

Nits addressed.

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ b09e5da

@bors

bors commented Mar 15, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b09e5da with merge 66853af...

bors added a commit that referenced this pull request Mar 15, 2015
Previously it would fail on a trivial case like

    /// Summary line
    /// <trailing space>
    /// Regular content

Compliant markdown preprocessor would render that as two separate paragraphs, but our summary line
extractor interprets both lines as the same paragraph and includes both into the short summary resulting in
![screenshot from 2015-03-13 22 47 08](https://cloud.githubusercontent.com/assets/679122/6648596/7ef792b2-c9e4-11e4-9c19-704c288ec4de.png)
Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 15, 2015
 Previously it would fail on a trivial case like

    /// Summary line
    /// <trailing space>
    /// Regular content

Compliant markdown preprocessor would render that as two separate paragraphs, but our summary line
extractor interprets both lines as the same paragraph and includes both into the short summary resulting in
![screenshot from 2015-03-13 22 47 08](https://cloud.githubusercontent.com/assets/679122/6648596/7ef792b2-c9e4-11e4-9c19-704c288ec4de.png)
@bors

bors commented Mar 15, 2015

Copy link
Copy Markdown
Collaborator

@bors
bors merged commit b09e5da into rust-lang:master Mar 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants