Skip to content

Consistent spelling of "adapter" in the standard library #87629

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Aug 2, 2021

Conversation

steffahn
Copy link
Member

Change all occurrences of "(A|a)daptor" to "(A|a)dapter".

The spelling “adapter” seems to be significantly more common both in general in the English language and also in the rust repository and standard library. I don’t like the inconsistency that’s currently found on pages like https://doc.rust-lang.org/std/iter/trait.Iterator.html. Note however that the Rust book consistently uses the spelling “iterator adaptor”.

Related discussion on Zulip (in the archive).

@rustbot label T-libs

Change all occurrences of "(A|a)daptor" to "(A|a)dapter".
@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Jul 30, 2021
@steffahn
Copy link
Member Author

@rust-highfive failed. I’m choosing at random from this list.

r? @kennytm

@m-ou-se
Copy link
Member

m-ou-se commented Jul 31, 2021

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 31, 2021

📌 Commit 8d2bb93 has been approved by m-ou-se

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 31, 2021
@m-ou-se m-ou-se assigned m-ou-se and unassigned kennytm Jul 31, 2021
@m-ou-se m-ou-se added the C-cleanup Category: PRs that clean code up or issues documenting cleanup. label Jul 31, 2021
@bors
Copy link
Collaborator

bors commented Aug 1, 2021

⌛ Testing commit 8d2bb93 with merge eaab0ccc385a561c017f51382a76efe85544d759...

@rust-log-analyzer
Copy link
Collaborator

The job dist-aarch64-apple failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
      Memory: 14 GB
      Boot ROM Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VM+UErM6Ncwm

hw.ncpu: 3
hw.byteorder: 1234
hw.memsize: 15032385536
---
[  6%] Built target MinGWOptionsTableGen
[  7%] Building CXX object lib/Core/CMakeFiles/lldCore.dir/Error.cpp.o
[  8%] Building CXX object Common/CMakeFiles/lldCommon.dir/Args.cpp.o
error: Connection to server timed out
make[2]: *** [lib/Core/CMakeFiles/lldCore.dir/DefinedAtom.cpp.o] Error 2
make[2]: *** Waiting for unfinished jobs....
error: Connection to server timed out
error: Connection to server timed out
make[2]: *** [lib/Core/CMakeFiles/lldCore.dir/Error.cpp.o] Error 2
make[1]: *** [lib/Core/CMakeFiles/lldCore.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
error: Connection to server timed out
error: Connection to server timed out
make[2]: *** [Common/CMakeFiles/lldCommon.dir/Args.cpp.o] Error 2
make[2]: *** Waiting for unfinished jobs....
clang: warning: argument unused during compilation: '-static-libstdc++' [-Wunused-command-line-argument]
clang: warning: argument unused during compilation: '-static-libstdc++' [-Wunused-command-line-argument]
make[1]: *** [Common/CMakeFiles/lldCommon.dir/all] Error 2
make: *** [all] Error 2
command did not execute successfully, got: exit status: 2


build script failed, must exit now', /Users/runner/.cargo/registry/src/github.heygears.com-1ecc6299db9ec823/cmake-0.1.44/src/lib.rs:885:5
 finished in 141.117 seconds
Build completed unsuccessfully in 3:29:42

@bors
Copy link
Collaborator

bors commented Aug 1, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 1, 2021
@steffahn
Copy link
Member Author

steffahn commented Aug 1, 2021

Failed building LLVM, seems unrelated to this PR.

@steffahn
Copy link
Member Author

steffahn commented Aug 1, 2021

Ah, there’s an “error: Connection to server timed out” in the logs, so a spurious failure.

@m-ou-se
Copy link
Member

m-ou-se commented Aug 1, 2021

@bors retry

@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 Aug 1, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2021
Rollup of 13 pull requests

Successful merges:

 - rust-lang#86183 (Change environment variable getters to error recoverably)
 - rust-lang#86439 (Remove `Ipv4Addr::is_ietf_protocol_assignment`)
 - rust-lang#86509 (Move `os_str_bytes` to `sys::unix`)
 - rust-lang#86593 (Partially stabilize `const_slice_first_last`)
 - rust-lang#86936 (Add documentation for `Ipv6MulticastScope`)
 - rust-lang#87282 (Ensure `./x.py dist` adheres to `build.tools`)
 - rust-lang#87468 (Update rustfmt)
 - rust-lang#87504 (Update mdbook.)
 - rust-lang#87608 (Remove unused field `Session.system_library_path`)
 - rust-lang#87629 (Consistent spelling of "adapter" in the standard library)
 - rust-lang#87633 (Update compiler_builtins to fix i128 shift/mul on thumbv6m)
 - rust-lang#87644 (Recommend `swap_remove` in `Vec::remove` docs)
 - rust-lang#87653 (mark a UB doctest as no_run)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 87c1436 into rust-lang:master Aug 2, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 2, 2021
@steffahn steffahn deleted the consistent_adapter_spelling branch August 2, 2021 07:16
chriskrycho added a commit to rust-lang/book that referenced this pull request Oct 4, 2024
This matches what Rust docs use (since rust-lang/rust#87629).

Fixes #3824
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants