Skip to content

Fix spelling in the documentation to htmldocck.py - #54989

Merged
bors merged 2 commits into
rust-lang:masterfrom
Munksgaard:fix-htmldocck-typos
Oct 12, 2018
Merged

Fix spelling in the documentation to htmldocck.py#54989
bors merged 2 commits into
rust-lang:masterfrom
Munksgaard:fix-htmldocck-typos

Conversation

@Munksgaard

Copy link
Copy Markdown
Contributor

I was reading through htmldocck.py, and decided to attempt to clean it up a little bit. Let me know if you disagree with my edits.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 11, 2018
There was an issue (rust-lang#33025) which caused these tests to not work. The issue has
since been fixed in rust-lang#33133, and so we can now include them.
@tmandry

Copy link
Copy Markdown
Member

cc @QuietMisdreavus

@tmandry

tmandry commented Oct 11, 2018

Copy link
Copy Markdown
Member

Thank you! 💯

@bors r+ rollup

@bors

bors commented Oct 11, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 1de8f51 has been approved by tmandry

@borsbors 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 Oct 11, 2018
@bors

This comment has been minimized.

@bors

This comment has been minimized.

kennytm added a commit to kennytm/rust that referenced this pull request Oct 12, 2018
…mandry
Fix spelling in the documentation to htmldocck.py
I was reading through htmldocck.py, and decided to attempt to clean it up a little bit. Let me know if you disagree with my edits.
@kennytmkennytm mentioned this pull request Oct 12, 2018
bors added a commit that referenced this pull request Oct 12, 2018
Rollup of 16 pull requests
Successful merges:
- #54755 (Documents reference equality by address (#54197))
- #54811 (During rustc bootstrap, make default for `optimize` independent of `debug`)
- #54825 (NLL says "borrowed content" instead of more precise "dereference of raw pointer")
- #54860 (Add doc comments about safest way to initialize a vector of zeros)
- #54869 (Fix mobile docs)
- #54891 (Fix tracking issue for Once::is_completed)
- #54913 (doc fix: it's auto traits that make for automatic implementations)
- #54920 (Fix handling of #[must_use] on unit and uninhabited types)
- #54932 (A handful of random string-related improvements)
- #54936 (impl Eq+Hash for TyLayout)
- #54950 (std: Synchronize global allocator on wasm32)
- #54956 ("(using ..." doesn't have the matching ")")
- #54958 (add a macro for static (compile-time) assertions)
- #54967 (Remove incorrect span for second label inner macro invocation)
- #54983 (Fix slice's benchmarks)
- #54989 (Fix spelling in the documentation to htmldocck.py)
Failed merges:
r? @ghost
@bors

bors commented Oct 12, 2018

Copy link
Copy Markdown
Collaborator

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

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 12, 2018
@bors
bors merged commit 1de8f51 into rust-lang:masterOct 12, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@Munksgaard@rust-highfive@tmandry@bors@nikomatsakis