Skip to content

Commit

Permalink
Fix typos (#2449)
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Jul 23, 2021
1 parent c8c2599 commit f4d5e8a
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions CHANGELOG.md
Expand Up @@ -102,7 +102,7 @@
* Fixed bug with zero-size buffers in vectored IO (#1998)
* `AtomicWaker::new()` is now `const fn` (#2007)
* Fixed bug between threadpool and user park/unparking (#2010)
* Added `stream::Peakable::peek` (#2021)
* Added `stream::Peekable::peek` (#2021)
* Added `StreamExt::scan` (#2044)
* Added impl of `AsyncRead`/`Write` for `BufReader`/`Writer` (#2033)
* Added impl of `Spawn` and `LocalSpawn` for `Arc<impl Spawn` and `Rc<impl Spawn>` (#2039)
Expand Down Expand Up @@ -238,7 +238,7 @@
# 0.3.0-alpha.14 - 2019-4-15
* Updated to new nightly `futures_api`.
* Changed `Forward` combinator to drop sink after completion, and allow `!Unpin` `Sink`s.
* Added 0.1 <-> 0.3 compatability shim for `Sink`s.
* Added 0.1 <-> 0.3 compatibility shim for `Sink`s.
* Changed `Sink::Item` to a generic parameter `Sink<Item>`, allowing `Sink`s to accept
multiple different types, including types containing references.
* Changed `AsyncRead` and `AsyncWrite` to take `Pin<&mut Self>` rather than `&mut self`.
Expand Down Expand Up @@ -313,8 +313,8 @@
* `StreamExt::boxed` combinator
* Unsoundness fix for `FuturesUnordered`
* `StreamObj` (similar to `FutureObj`)
* Code examples for compatiblity layer functions
* Use cargo create renaming feature to import `futures@0.1` for compatiblily layer
* Code examples for compatibility layer functions
* Use cargo create renaming feature to import `futures@0.1` for compatibility layer
* Import pinning APIs from `core::pin`
* Run Clippy in CI only when it is available

Expand All @@ -338,7 +338,7 @@

# 0.3.0-alpha.2 - 2018-07-30
* The changelog is back!
* Compatiblity with futures API in latest nightly
* Compatibility with futures API in latest nightly
* Code examples and doc improvements
- IO: Methods of traits `AsyncReadExt`, `AsyncWriteExt`
- Future:
Expand All @@ -360,7 +360,7 @@
* We now use the unstable `use_extern_macros` feature for macro reexports
* CI improvements: Named CI jobs, tests are now run on macOS and Linux, the docs are generated and Clippy needs to pass
* `#[deny(warnings)]` was removed from all crates and is now only enforced in the CI
* We now have a naming convention for type paramters: `Fut` future, `F` function, `St` stream, `Si` sink, `S` sink & stream, `R` reader, `W` writer, `T` value, `E` error
* We now have a naming convention for type parameters: `Fut` future, `F` function, `St` stream, `Si` sink, `S` sink & stream, `R` reader, `W` writer, `T` value, `E` error
* "Task" is now defined as our term for "lightweight thread". The code of the executors and `FuturesUnordered` was refactored to align with this definition.

# 0.3.0-alpha.1 - 2018-07-19
Expand Down
2 changes: 1 addition & 1 deletion examples/functional/src/main.rs
Expand Up @@ -38,7 +38,7 @@ fn main() {
};

// Actually execute the above future, which will invoke Future::poll and
// subsequenty chain appropriate Future::poll and methods needing executors
// subsequently chain appropriate Future::poll and methods needing executors
// to drive all futures. Eventually fut_values will be driven to completion.
let values: Vec<i32> = executor::block_on(fut_values);

Expand Down
2 changes: 1 addition & 1 deletion examples/imperative/src/main.rs
Expand Up @@ -40,7 +40,7 @@ fn main() {
};

// Actually execute the above future, which will invoke Future::poll and
// subsequenty chain appropriate Future::poll and methods needing executors
// subsequently chain appropriate Future::poll and methods needing executors
// to drive all futures. Eventually fut_values will be driven to completion.
let values: Vec<i32> = executor::block_on(fut_values);

Expand Down
2 changes: 1 addition & 1 deletion futures-channel/src/mpsc/mod.rs
Expand Up @@ -511,7 +511,7 @@ impl<T> BoundedSenderInner<T> {
// Do the send without failing.
// Can be called only by bounded sender.
fn do_send_b(&mut self, msg: T) -> Result<(), TrySendError<T>> {
// Anyone callig do_send *should* make sure there is room first,
// Anyone calling do_send *should* make sure there is room first,
// but assert here for tests as a sanity check.
debug_assert!(self.poll_unparked(None).is_ready());

Expand Down
4 changes: 2 additions & 2 deletions futures-executor/src/thread_pool.rs
Expand Up @@ -245,7 +245,7 @@ impl ThreadPoolBuilder {
/// Execute closure `f` just prior to shutting down each worker thread.
///
/// This hook is intended for bookkeeping and monitoring.
/// The closure `f` will be dropped after the `builder` is droppped
/// The closure `f` will be dropped after the `builder` is dropped
/// and all threads in the pool have executed it.
///
/// The closure provided will receive an index corresponding to the worker
Expand Down Expand Up @@ -367,7 +367,7 @@ mod tests {
.create()
.unwrap();

// After ThreadPoolBuilder is deconstructed, the tx should be droped
// After ThreadPoolBuilder is deconstructed, the tx should be dropped
// so that we can use rx as an iterator.
let count = rx.into_iter().count();
assert_eq!(count, 2);
Expand Down
2 changes: 1 addition & 1 deletion futures-executor/tests/local_pool.rs
Expand Up @@ -404,7 +404,7 @@ fn tasks_are_scheduled_fairly() {
}

// Tests that the use of park/unpark in user-code has no
// effect on the expected behaviour of the executor.
// effect on the expected behavior of the executor.
#[test]
fn park_unpark_independence() {
let mut done = false;
Expand Down
2 changes: 1 addition & 1 deletion futures-test/src/task/mod.rs
@@ -1,5 +1,5 @@
// TODO: note that paths like futures_core::task::Context actually get redirected to core::task::Context
// in the redered docs. Is this desirable? If so, should we change the paths here?
// in the rendered docs. Is this desirable? If so, should we change the paths here?
//
// Also, there is cross crate links in here. They are not going to work anytime soon. Do we put https links
// in here? to here: https://rust-lang.github.io/futures-api-docs? The problem is these have a
Expand Down
2 changes: 1 addition & 1 deletion futures-util/src/io/fill_buf.rs
Expand Up @@ -30,7 +30,7 @@ where
let reader = this.reader.take().expect("Polled FillBuf after completion");

match Pin::new(&mut *reader).poll_fill_buf(cx) {
// With polinius it is possible to remove this inner match and just have the correct
// With polonius it is possible to remove this inner match and just have the correct
// lifetime of the reference inferred based on which branch is taken
Poll::Ready(Ok(_)) => match Pin::new(reader).poll_fill_buf(cx) {
Poll::Ready(Ok(slice)) => Poll::Ready(Ok(slice)),
Expand Down
2 changes: 1 addition & 1 deletion futures-util/src/stream/futures_unordered/mod.rs
Expand Up @@ -97,7 +97,7 @@ impl LocalSpawn for FuturesUnordered<LocalFutureObj<'_, ()>> {
// Each task is wrapped in an `Arc` and thereby atomically reference counted.
// Also, each task contains an `AtomicBool` which acts as a flag that indicates
// whether the task is currently inserted in the atomic queue. When a wake-up
// notifiaction is received, the task will only be inserted into the ready to
// notification is received, the task will only be inserted into the ready to
// run queue if it isn't inserted already.

impl<Fut> Default for FuturesUnordered<Fut> {
Expand Down
2 changes: 1 addition & 1 deletion futures-util/src/stream/try_stream/try_chunks.rs
Expand Up @@ -111,7 +111,7 @@ where

/// Error indicating, that while chunk was collected inner stream produced an error.
///
/// Contains all items that were collected before an error occured, and the stream error itself.
/// Contains all items that were collected before an error occurred, and the stream error itself.
#[derive(PartialEq, Eq)]
pub struct TryChunksError<T, E>(pub Vec<T>, pub E);

Expand Down
2 changes: 1 addition & 1 deletion futures/src/lib.rs
Expand Up @@ -67,7 +67,7 @@
//! };
//!
//! // Actually execute the above future, which will invoke Future::poll and
//! // subsequenty chain appropriate Future::poll and methods needing executors
//! // subsequently chain appropriate Future::poll and methods needing executors
//! // to drive all futures. Eventually fut_values will be driven to completion.
//! let values: Vec<i32> = executor::block_on(fut_values);
//!
Expand Down
2 changes: 1 addition & 1 deletion futures/tests/try_join.rs
Expand Up @@ -3,7 +3,7 @@
use futures::{executor::block_on, try_join};

// TODO: This abuses https://github.com/rust-lang/rust/issues/58733 in order to
// test behaviour of the `try_join!` macro with the never type before it is
// test behavior of the `try_join!` macro with the never type before it is
// stabilized. Once `!` is again stabilized this can be removed and replaced
// with direct use of `!` below where `Never` is used.
trait MyTrait {
Expand Down

0 comments on commit f4d5e8a

Please sign in to comment.