Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/core/src/iter/adapters/flatten.rs
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ impl<T> OneShot for result::IterMut<'_, T> {}
impl<T> OneShot for Empty<T> {}
impl<T> OneShot for array::IntoIter<T, 0> {}

// These adaptors never increase the number of items.
// These adapters never increase the number of items.
// (There are more possible, but for now this matches BoundedSize above.)
impl<I: OneShot> OneShot for Cloned<I> {}
impl<I: OneShot> OneShot for Copied<I> {}
Expand Down
2 changes: 1 addition & 1 deletion library/std/src/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ pub trait Read {
default_read_buf_exact(self, cursor)
}

/// Creates a "by reference" adaptor for this instance of `Read`.
/// Creates a "by reference" adapter for this instance of `Read`.
///
/// The returned adapter also implements `Read` and will simply borrow this
/// current reader.
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/iterators/issue-58952-filter-type-length.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//@ compile-flags: -Znext-solver
//@ check-pass

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

Expand Down
Loading