Skip to content

Commit 021439e

Browse files
authored
Rollup merge of rust-lang#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.
2 parents f6092f2 + 325ceef commit 021439e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

library/core/src/iter/adapters/flatten.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ impl<T> OneShot for result::IterMut<'_, T> {}
779779
impl<T> OneShot for Empty<T> {}
780780
impl<T> OneShot for array::IntoIter<T, 0> {}
781781

782-
// These adaptors never increase the number of items.
782+
// These adapters never increase the number of items.
783783
// (There are more possible, but for now this matches BoundedSize above.)
784784
impl<I: OneShot> OneShot for Cloned<I> {}
785785
impl<I: OneShot> OneShot for Copied<I> {}

library/std/src/io/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ pub trait Read {
10811081
default_read_buf_exact(self, cursor)
10821082
}
10831083

1084-
/// Creates a "by reference" adaptor for this instance of `Read`.
1084+
/// Creates a "by reference" adapter for this instance of `Read`.
10851085
///
10861086
/// The returned adapter also implements `Read` and will simply borrow this
10871087
/// current reader.

tests/ui/iterators/issue-58952-filter-type-length.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
//! This snippet causes the type length to blowup exponentially,
44
//! so check that we don't accidentally exceed the type length limit.
5-
// FIXME: Once the size of iterator adaptors is further reduced,
5+
// FIXME: Once the size of iterator adapters is further reduced,
66
// increase the complexity of this test.
77
use std::collections::VecDeque;
88

tests/ui/traits/next-solver/typeck/normalize-in-upvar-collection.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//@ compile-flags: -Znext-solver
22
//@ check-pass
33

4-
// Fixes a regression in icu_provider_adaptors where we weren't normalizing the
4+
// Fixes a regression in icu_provider_adapters where we weren't normalizing the
55
// return type of a function type before performing a `Ty::builtin_deref` call,
66
// leading to an ICE.
77

0 commit comments

Comments
 (0)