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.

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

Fix typos in librustdoc, tools and config files #110155

Merged
merged 3 commits into from
Apr 12, 2023
Merged

Fix typos in librustdoc, tools and config files #110155

merged 3 commits into from
Apr 12, 2023

Conversation

DaniPopes
Copy link
Contributor

I used typos to fix all typos, minus the ones present in #110153 and in #110154.

Refs #110150

@rustbot
Copy link
Collaborator

rustbot commented Apr 10, 2023

r? @GuillaumeGomez

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

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-style Relevant to the style team, which will review and decide on the PR/issue. labels Apr 10, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 10, 2023

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing src/librustdoc/json/conversions.rs; otherwise, make sure you bump the FORMAT_VERSION constant.

cc @CraftSpider, @aDotInTheVoid, @Enselic, @obi1kenobi

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

@DaniPopes DaniPopes mentioned this pull request Apr 10, 2023
Closed
jyn514
jyn514 approved these changes Apr 10, 2023
View reviewed changes
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

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

Thanks! I have one change I'm not sure about, but the rest all look correct :)

src/tools/publish_toolstate.py Outdated Show resolved Hide resolved
@jyn514
Copy link
Member

jyn514 commented Apr 11, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 11, 2023

📌 Commit c37e728 has been approved by jyn514

It is now in the queue for this repository.

@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 Apr 11, 2023
@Dylan-DPC Dylan-DPC mentioned this pull request Apr 11, 2023
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 11, 2023
@Dylan-DPC
Rollup merge of rust-lang#110155 - DaniPopes:rest-typos, r=jyn514
079e147 
Fix typos in librustdoc, tools and config files

I used [`typos`](https://github.com/crate-ci/typos) to fix all typos, minus the ones present in rust-lang#110153 and in rust-lang#110154.

Refs rust-lang#110150
@compiler-errors compiler-errors mentioned this pull request Apr 11, 2023
Closed
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Apr 11, 2023
@compiler-errors
Rollup merge of rust-lang#110155 - DaniPopes:rest-typos, r=jyn514
17a6fa4 
Fix typos in librustdoc, tools and config files

I used [`typos`](https://github.com/crate-ci/typos) to fix all typos, minus the ones present in rust-lang#110153 and in rust-lang#110154.

Refs rust-lang#110150
@compiler-errors compiler-errors mentioned this pull request Apr 12, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2023
@bors
Auto merge of rust-lang#110214 - compiler-errors:rollup-mkig4t6, r=co…
0d7ed3b 
…mpiler-errors

Rollup of 10 pull requests

Successful merges:

 - rust-lang#96971 (Initial support for loongarch64-unknown-linux-gnu)
 - rust-lang#109894 (Remove Errors section from var_os docs)
 - rust-lang#110000 (Rename tests/ui/unique to tests/ui/box/unit)
 - rust-lang#110018 (Pass host linker to compiletest.)
 - rust-lang#110104 ( Reword the docstring in todo! macro definition, fixing a typo)
 - rust-lang#110113 (Fix `x test ui --target foo` when download-rustc is enabled)
 - rust-lang#110126 (Support safe transmute in new solver)
 - rust-lang#110155 (Fix typos in librustdoc, tools and config files)
 - rust-lang#110162 (rustdoc: remove redundant expandSection code from main.js)
 - rust-lang#110173 (kmc-solid: Implement `Socket::read_buf`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e697545 into rust-lang:master Apr 12, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 12, 2023
@DaniPopes DaniPopes deleted the rest-typos branch April 12, 2023 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-style Relevant to the style team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
5 participants
@DaniPopes @rustbot @jyn514 @bors @GuillaumeGomez