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

Fix bold code formatting in keyword docs #79383

Merged
merged 1 commit into from
Nov 28, 2020
Merged

Conversation

abdnh
Copy link
Contributor

@abdnh abdnh commented Nov 24, 2020

No description provided.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @shepmaster (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 24, 2020
Comment on lines 710 to 711
/// * <code>for _ **in** 1..3 {}</code> - Iterate over an exclusive range up to but excluding 3.
/// * <code>for _ **in** 1..=3 {}</code> - Iterate over an inclusive range up to and including 3.
Copy link
Contributor

@pickfire pickfire Nov 24, 2020

Choose a reason for hiding this comment

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

Should we just remove the bold? Even though it may remove the emphasis but looks pretty clear to me already, or maybe we bold the in keyword in the details part above in addition to this?

Suggested change
/// * <code>for _ **in** 1..3 {}</code> - Iterate over an exclusive range up to but excluding 3.
/// * <code>for _ **in** 1..=3 {}</code> - Iterate over an inclusive range up to and including 3.
/// * `for _ in 1..3 {}` - Iterate over an exclusive range up to but excluding 3.
/// * `for _ in 1..=3 {}` - Iterate over an inclusive range up to and including 3.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I also thought of just removing the bold instead of writing HTML here. I'll do that.
I'm not sure where exactly you suggest to bold the in keyword in addition to this. I'm not very familiar with the docs.

@@ -707,8 +707,8 @@ mod impl_keyword {}
///
Copy link
Contributor

Choose a reason for hiding this comment

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

Just above this line, like **`in`**.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This style doesn't seem to be used anywhere in this file at least.
I also think removing the bold is enough.

@shepmaster
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 27, 2020

📌 Commit 38cc998 has been approved by shepmaster

@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 Nov 27, 2020
@shepmaster
Copy link
Member

Thanks!

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 28, 2020
…as-schievink

Rollup of 10 pull requests

Successful merges:

 - rust-lang#78086 (Improve doc for 'as _')
 - rust-lang#78853 (rustc_parse: fix ConstBlock expr span)
 - rust-lang#79234 (Resolve typedefs in HashMap gdb/lldb pretty-printers)
 - rust-lang#79344 (Convert UNC path to local path to satisfy install script on Windows)
 - rust-lang#79383 (Fix bold code formatting in keyword docs)
 - rust-lang#79460 (Remove intermediate vectors from `add_bounds`)
 - rust-lang#79474 (Change comments on types to doc-comments)
 - rust-lang#79476 (Sync rustc_codegen_cranelift)
 - rust-lang#79478 (Expand docs on Peekable::peek_mut)
 - rust-lang#79486 (Slightly improve code samples in E0591)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1337586 into rust-lang:master Nov 28, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 28, 2020
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