Skip to content

Conversation

ctz
Copy link
Contributor

@ctz ctz commented Sep 16, 2025

These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.)

A second commit comes along for the ride to fix other instances in non-rustdoc comments.

ctz added 2 commits September 16, 2025 11:51
These docs are in en_US, so "adapter" is the correct spelling
(and indeed used in the next line.)
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Sep 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Sep 16, 2025

r? @petrochenkov

rustbot has assigned @petrochenkov.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@joboet
Copy link
Member

joboet commented Sep 19, 2025

😢 but "adaptor" is so colourful... and makes so much more sense, it's derived from Latin 😁

/s obviously consistency is important

@petrochenkov
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 22, 2025

📌 Commit 325ceef has been approved by petrochenkov

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 Sep 22, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 22, 2025
…henkov

Fix uses of "adaptor"

These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.)

A second commit comes along for the ride to fix other instances in non-rustdoc comments.
bors added a commit that referenced this pull request Sep 22, 2025
Rollup of 7 pull requests

Successful merges:

 - #146632 (Fix uses of "adaptor")
 - #146775 (fixes for numerous clippy warnings)
 - #146802 (mbe: Simplifications and refactoring)
 - #146806 (add private module override re-export test)
 - #146866 ([rustdoc] Correctly handle intra doc link when type alias disambiguator is passed for primitive)
 - #146896 (rustc-dev-guide subtree update)
 - #146898 (Update books)

r? `@ghost`
`@rustbot` modify labels: rollup
Zalathar added a commit to Zalathar/rust that referenced this pull request Sep 23, 2025
…henkov

Fix uses of "adaptor"

These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.)

A second commit comes along for the ride to fix other instances in non-rustdoc comments.
bors added a commit that referenced this pull request Sep 23, 2025
Rollup of 13 pull requests

Successful merges:

 - #146632 (Fix uses of "adaptor")
 - #146731 (test: Use SVG for terminal url test)
 - #146775 (fixes for numerous clippy warnings)
 - #146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows)
 - #146799 (Fix a dangling reference in `rustc_thread_pool`)
 - #146802 (mbe: Simplifications and refactoring)
 - #146806 (add private module override re-export test)
 - #146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly))
 - #146875 (tests/run-make/crate-loading: Rename source files for clarity)
 - #146896 (rustc-dev-guide subtree update)
 - #146898 (Update books)
 - #146899 (Fix a crash/mislex when more than one frontmatter closing possibility is considered)
 - #146907 (add regression test for issue 146537)

r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol added a commit to Kobzol/rust that referenced this pull request Sep 23, 2025
…henkov

Fix uses of "adaptor"

These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.)

A second commit comes along for the ride to fix other instances in non-rustdoc comments.
bors added a commit that referenced this pull request Sep 23, 2025
Rollup of 8 pull requests

Successful merges:

 - #146632 (Fix uses of "adaptor")
 - #146731 (test: Use SVG for terminal url test)
 - #146775 (fixes for numerous clippy warnings)
 - #146802 (mbe: Simplifications and refactoring)
 - #146875 (tests/run-make/crate-loading: Rename source files for clarity)
 - #146896 (rustc-dev-guide subtree update)
 - #146898 (Update books)
 - #146899 (Fix a crash/mislex when more than one frontmatter closing possibility is considered)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Sep 23, 2025
Rollup of 10 pull requests

Successful merges:

 - #146632 (Fix uses of "adaptor")
 - #146731 (test: Use SVG for terminal url test)
 - #146775 (fixes for numerous clippy warnings)
 - #146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows)
 - #146799 (Fix a dangling reference in `rustc_thread_pool`)
 - #146802 (mbe: Simplifications and refactoring)
 - #146806 (add private module override re-export test)
 - #146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly))
 - #146875 (tests/run-make/crate-loading: Rename source files for clarity)
 - #146877 (prevent line number from being copied in chrome)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 076ada5 into rust-lang:master Sep 23, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Sep 23, 2025
rust-timer added a commit that referenced this pull request Sep 23, 2025
Rollup merge of #146632 - ctz:jbp-adaptor-spelling, r=petrochenkov

Fix uses of "adaptor"

These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.)

A second commit comes along for the ride to fix other instances in non-rustdoc comments.
Muscraft pushed a commit to Muscraft/rust that referenced this pull request Sep 24, 2025
…henkov

Fix uses of "adaptor"

These docs are in en_US, so "adapter" is the correct spelling (and indeed used in the next line.)

A second commit comes along for the ride to fix other instances in non-rustdoc comments.
Muscraft pushed a commit to Muscraft/rust that referenced this pull request Sep 24, 2025
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#146632 (Fix uses of "adaptor")
 - rust-lang#146731 (test: Use SVG for terminal url test)
 - rust-lang#146775 (fixes for numerous clippy warnings)
 - rust-lang#146784 ([win] Use find-msvc-tools instead of cc to find the linker and rc on Windows)
 - rust-lang#146799 (Fix a dangling reference in `rustc_thread_pool`)
 - rust-lang#146802 (mbe: Simplifications and refactoring)
 - rust-lang#146806 (add private module override re-export test)
 - rust-lang#146827 (Linker-plugin-based LTO: update list of good combinations (inc. beta + nightly))
 - rust-lang#146875 (tests/run-make/crate-loading: Rename source files for clarity)
 - rust-lang#146877 (prevent line number from being copied in chrome)

r? `@ghost`
`@rustbot` modify labels: rollup
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants