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

Handle ordered lists as well #41049

Closed

Conversation

GuillaumeGomez
Copy link
Member

Part of #40912.

r? @rust-lang/docs

@frewsxcv
Copy link
Member

frewsxcv commented Apr 3, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Apr 3, 2017

📌 Commit b02cb19 has been approved by frewsxcv

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 4, 2017
…, r=frewsxcv

Handle ordered lists as well

Part of rust-lang#40912.

r? @rust-lang/docs
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 4, 2017
…, r=frewsxcv

Handle ordered lists as well

Part of rust-lang#40912.

r? @rust-lang/docs
Copy link
Member

@steveklabnik steveklabnik left a comment

Choose a reason for hiding this comment

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

one tiny name change, then this looks good to me

}
buffer.push_str(&format!("<li>{}</li>", content));
}

fn list(parser: &mut ParserWrapper, buffer: &mut String, toc_builder: &mut Option<TocBuilder>,
shorter: MarkdownOutputStyle) {
shorter: MarkdownOutputStyle, is_sorted_list: bool) {
Copy link
Member

Choose a reason for hiding this comment

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

shouldn't this be "ordered" and not "sorted"

Copy link
Member

Choose a reason for hiding this comment

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

I don't think this is a huge deal

Copy link
Member Author

Choose a reason for hiding this comment

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

Oups, good point!

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 5, 2017
…, r=frewsxcv

Handle ordered lists as well

Part of rust-lang#40912.

r? @rust-lang/docs
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 5, 2017
…, r=frewsxcv

Handle ordered lists as well

Part of rust-lang#40912.

r? @rust-lang/docs
bors added a commit that referenced this pull request Apr 5, 2017
@GuillaumeGomez
Copy link
Member Author

@bors: r=frewsxcv

@bors
Copy link
Contributor

bors commented Apr 5, 2017

📌 Commit 5652561 has been approved by frewsxcv

@frewsxcv
Copy link
Member

frewsxcv commented Apr 5, 2017

Note that if the rollup lands, your commit is not going to be included

@steveklabnik
Copy link
Member

steveklabnik commented Apr 5, 2017 via email

@GuillaumeGomez
Copy link
Member Author

Ah damn. :'(

I'll write a "fix" afterwards then.

@bors
Copy link
Contributor

bors commented Apr 5, 2017

☔ The latest upstream changes (presumably #41086) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabnik
Copy link
Member

This was actually merged, the amendment after didn't make it, but that's fine.

@GuillaumeGomez GuillaumeGomez deleted the rustdoc-ordered-list branch April 7, 2017 19:42
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.

4 participants