Skip to content

Commit

Permalink
Merge pull request #1031 from kianmeng/fix-typos
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
joshtriplett authored Jul 13, 2022
2 parents c6b2128 + fc69db1 commit 798ce31
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ deprecated `sync::channel` types, and introduces the `tokio1` feature.

As part of our `1.8.0` release last month we introduced the new
`async_std::channel` submodule and deprecated the unstable
`async_std::sync::channel` types. You can read our full motiviation for this
`async_std::sync::channel` types. You can read our full motivation for this
change in the last patch notes. But the short version is that the old
channels had some fundamental problems, and the `sync` submodule is a bit of
a mess.
Expand Down
2 changes: 1 addition & 1 deletion docs/src/security/index.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Security

Writing a highly perfomant async core library is a task involving some instances of unsafe code.
Writing a highly performant async core library is a task involving some instances of unsafe code.

We take great care in vetting all unsafe code included in `async-std` and do follow generally accepted practices.

Expand Down
2 changes: 1 addition & 1 deletion docs/src/tutorial/clean_shutdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ async fn broker_loop(mut events: Receiver<Event>) -> Result<()> {
Notice what happens with all of the channels once we exit the accept loop:

1. First, we drop the main broker's sender.
That way when the readers are done, there's no sender for the broker's channel, and the chanel closes.
That way when the readers are done, there's no sender for the broker's channel, and the channel closes.
2. Next, the broker exits `while let Some(event) = events.next().await` loop.
3. It's crucial that, at this stage, we drop the `peers` map.
This drops writer's senders.
Expand Down
2 changes: 1 addition & 1 deletion src/fs/open_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ impl OpenOptions {
/// Configures the option for append mode.
///
/// When set to `true`, this option means the file will be writable after opening and the file
/// cursor will be moved to the end of file before every write operaiton.
/// cursor will be moved to the end of file before every write operation.
///
/// # Examples
///
Expand Down
2 changes: 1 addition & 1 deletion src/io/write/write_fmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl<T: Write + Unpin + ?Sized> Future for WriteFmtFuture<'_, T> {
type Output = io::Result<()>;

fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
// Process the interal Result the first time we run.
// Process the internal Result the first time we run.
if self.buffer.is_none() {
match self.res.take().unwrap() {
Err(err) => return Poll::Ready(Err(err)),
Expand Down
2 changes: 1 addition & 1 deletion src/stream/stream/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ pub trait StreamExt: Stream {
the stream and ignore elements until it returns `false`.
After `false` is returned, `SkipWhile`'s job is over and all further
elements in the strem are yielded.
elements in the stream are yielded.
## Examples
Expand Down
2 changes: 1 addition & 1 deletion src/sync/condvar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ impl Condvar {
}
}

/// Blocks the current taks until this condition variable receives a notification and the
/// Blocks the current task until this condition variable receives a notification and the
/// required condition is met. Spurious wakeups are ignored and this function will only
/// return once the condition has been met.
///
Expand Down

0 comments on commit 798ce31

Please sign in to comment.