Skip to content

Commit 64f0050

Browse files
committed
Fix typos (#2449)
1 parent 3047016 commit 64f0050

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
* Fixed bug with zero-size buffers in vectored IO (#1998)
103103
* `AtomicWaker::new()` is now `const fn` (#2007)
104104
* Fixed bug between threadpool and user park/unparking (#2010)
105-
* Added `stream::Peakable::peek` (#2021)
105+
* Added `stream::Peekable::peek` (#2021)
106106
* Added `StreamExt::scan` (#2044)
107107
* Added impl of `AsyncRead`/`Write` for `BufReader`/`Writer` (#2033)
108108
* Added impl of `Spawn` and `LocalSpawn` for `Arc<impl Spawn` and `Rc<impl Spawn>` (#2039)
@@ -238,7 +238,7 @@
238238
# 0.3.0-alpha.14 - 2019-4-15
239239
* Updated to new nightly `futures_api`.
240240
* Changed `Forward` combinator to drop sink after completion, and allow `!Unpin` `Sink`s.
241-
* Added 0.1 <-> 0.3 compatability shim for `Sink`s.
241+
* Added 0.1 <-> 0.3 compatibility shim for `Sink`s.
242242
* Changed `Sink::Item` to a generic parameter `Sink<Item>`, allowing `Sink`s to accept
243243
multiple different types, including types containing references.
244244
* Changed `AsyncRead` and `AsyncWrite` to take `Pin<&mut Self>` rather than `&mut self`.
@@ -313,8 +313,8 @@
313313
* `StreamExt::boxed` combinator
314314
* Unsoundness fix for `FuturesUnordered`
315315
* `StreamObj` (similar to `FutureObj`)
316-
* Code examples for compatiblity layer functions
317-
* Use cargo create renaming feature to import `futures@0.1` for compatiblily layer
316+
* Code examples for compatibility layer functions
317+
* Use cargo create renaming feature to import `futures@0.1` for compatibility layer
318318
* Import pinning APIs from `core::pin`
319319
* Run Clippy in CI only when it is available
320320

@@ -338,7 +338,7 @@
338338

339339
# 0.3.0-alpha.2 - 2018-07-30
340340
* The changelog is back!
341-
* Compatiblity with futures API in latest nightly
341+
* Compatibility with futures API in latest nightly
342342
* Code examples and doc improvements
343343
- IO: Methods of traits `AsyncReadExt`, `AsyncWriteExt`
344344
- Future:
@@ -360,7 +360,7 @@
360360
* We now use the unstable `use_extern_macros` feature for macro reexports
361361
* CI improvements: Named CI jobs, tests are now run on macOS and Linux, the docs are generated and Clippy needs to pass
362362
* `#[deny(warnings)]` was removed from all crates and is now only enforced in the CI
363-
* 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
363+
* 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
364364
* "Task" is now defined as our term for "lightweight thread". The code of the executors and `FuturesUnordered` was refactored to align with this definition.
365365

366366
# 0.3.0-alpha.1 - 2018-07-19

examples/functional/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn main() {
3838
};
3939

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

examples/imperative/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn main() {
4040
};
4141

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

futures-channel/src/mpsc/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ impl<T> BoundedSenderInner<T> {
511511
// Do the send without failing.
512512
// Can be called only by bounded sender.
513513
fn do_send_b(&mut self, msg: T) -> Result<(), TrySendError<T>> {
514-
// Anyone callig do_send *should* make sure there is room first,
514+
// Anyone calling do_send *should* make sure there is room first,
515515
// but assert here for tests as a sanity check.
516516
debug_assert!(self.poll_unparked(None).is_ready());
517517

futures-executor/src/thread_pool.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ impl ThreadPoolBuilder {
245245
/// Execute closure `f` just prior to shutting down each worker thread.
246246
///
247247
/// This hook is intended for bookkeeping and monitoring.
248-
/// The closure `f` will be dropped after the `builder` is droppped
248+
/// The closure `f` will be dropped after the `builder` is dropped
249249
/// and all threads in the pool have executed it.
250250
///
251251
/// The closure provided will receive an index corresponding to the worker
@@ -367,7 +367,7 @@ mod tests {
367367
.create()
368368
.unwrap();
369369

370-
// After ThreadPoolBuilder is deconstructed, the tx should be droped
370+
// After ThreadPoolBuilder is deconstructed, the tx should be dropped
371371
// so that we can use rx as an iterator.
372372
let count = rx.into_iter().count();
373373
assert_eq!(count, 2);

futures-executor/tests/local_pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ fn tasks_are_scheduled_fairly() {
404404
}
405405

406406
// Tests that the use of park/unpark in user-code has no
407-
// effect on the expected behaviour of the executor.
407+
// effect on the expected behavior of the executor.
408408
#[test]
409409
fn park_unpark_independence() {
410410
let mut done = false;

futures-test/src/task/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// TODO: note that paths like futures_core::task::Context actually get redirected to core::task::Context
2-
// in the redered docs. Is this desirable? If so, should we change the paths here?
2+
// in the rendered docs. Is this desirable? If so, should we change the paths here?
33
//
44
// Also, there is cross crate links in here. They are not going to work anytime soon. Do we put https links
55
// in here? to here: https://rust-lang.github.io/futures-api-docs? The problem is these have a

futures-util/src/io/fill_buf.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ where
3030
let reader = this.reader.take().expect("Polled FillBuf after completion");
3131

3232
match Pin::new(&mut *reader).poll_fill_buf(cx) {
33-
// With polinius it is possible to remove this inner match and just have the correct
33+
// With polonius it is possible to remove this inner match and just have the correct
3434
// lifetime of the reference inferred based on which branch is taken
3535
Poll::Ready(Ok(_)) => match Pin::new(reader).poll_fill_buf(cx) {
3636
Poll::Ready(Ok(slice)) => Poll::Ready(Ok(slice)),

futures-util/src/stream/futures_unordered/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl LocalSpawn for FuturesUnordered<LocalFutureObj<'_, ()>> {
9797
// Each task is wrapped in an `Arc` and thereby atomically reference counted.
9898
// Also, each task contains an `AtomicBool` which acts as a flag that indicates
9999
// whether the task is currently inserted in the atomic queue. When a wake-up
100-
// notifiaction is received, the task will only be inserted into the ready to
100+
// notification is received, the task will only be inserted into the ready to
101101
// run queue if it isn't inserted already.
102102

103103
impl<Fut> Default for FuturesUnordered<Fut> {

futures-util/src/stream/try_stream/try_chunks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ where
111111

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

0 commit comments

Comments
 (0)