Skip to content

Keyword doc #51581

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jun 16, 2018
Merged

Keyword doc #51581

merged 3 commits into from
Jun 16, 2018

Conversation

GuillaumeGomez
Copy link
Member

Part of #51451.

r? @QuietMisdreavus

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 15, 2018
QuietMisdreavus
QuietMisdreavus reviewed Jun 15, 2018
View reviewed changes
src/tools/rustdoc-js/tester.js Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Any particular reason you went with a new should_fail_happy variable instead of reusing error_text like the regular output does? Just the early return?

QuietMisdreavus
QuietMisdreavus reviewed Jun 15, 2018
View reviewed changes
src/libstd/keyword_docs.rs

#[doc(keyword = "fn")]
//
/// The `fn` keyword.
Copy link
Contributor

Choose a reason for hiding this comment

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

Did we ever figure out if we needed the extra // between the regular attribute and the docs, or was that just for spacing?

Copy link
Member Author

Choose a reason for hiding this comment

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

Just for spacing.

Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense. It seems a bit weird to leave it in, but i won't let it hold up the PR.

@QuietMisdreavus
Copy link
Contributor

Thanks so much for kicking this off! (And for picking the one that immediately led to a problem to fix, haha!) Hopefully with the file in place we can send the great checklist out for new contributors. r=me pending travis.

@GuillaumeGomez
Copy link
Member Author

@bors: r=QuietMisdreavus

@bors
Copy link
Collaborator

bors commented Jun 15, 2018

📌 Commit 1fcce48 has been approved by QuietMisdreavus

@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 Jun 15, 2018
@bors
Copy link
Collaborator

bors commented Jun 16, 2018

⌛ Testing commit 1fcce48 with merge 01fb32b...

bors added a commit that referenced this pull request Jun 16, 2018
@bors
Auto merge of #51581 - GuillaumeGomez:keyword-doc, r=QuietMisdreavus
01fb32b 
Keyword doc

Part of #51451.

r? @QuietMisdreavus
@bors
Copy link
Collaborator

bors commented Jun 16, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: QuietMisdreavus
Pushing 01fb32b to master...

@bors bors merged commit 1fcce48 into rust-lang:master Jun 16, 2018
@GuillaumeGomez GuillaumeGomez deleted the keyword-doc branch June 16, 2018 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@QuietMisdreavus QuietMisdreavus QuietMisdreavus left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@QuietMisdreavus QuietMisdreavus

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuillaumeGomez @QuietMisdreavus @bors @rust-highfive