diff options
| author | bors <bors@rust-lang.org> | 2018-04-05 19:25:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-05 19:25:37 +0000 |
| commit | 48fa6f9631868b07309b02f479e2ec523bb58c2b (patch) | |
| tree | f42e4285226c191c4448946f440ba79642ba1080 /src/libstd/sys | |
| parent | 7222241e7c2d7caf9ad6ee6e34748e4addfb8dd3 (diff) | |
| parent | cd615e9863fa4593ff87243920875ad5bb73906a (diff) | |
| download | rust-48fa6f9631868b07309b02f479e2ec523bb58c2b.tar.gz rust-48fa6f9631868b07309b02f479e2ec523bb58c2b.zip | |
Auto merge of #49696 - alexcrichton:rollup, r=alexcrichton
Rollup of 8 pull requests
Successful merges:
- #49045 (Make queries thread safe)
- #49350 (Expand macros in `extern {}` blocks)
- #49497 (Chalkify - Tweak `Clause` definition and HRTBs)
- #49597 (proc_macro: Reorganize public API)
- #49686 (typos)
- #49621
- #49697
- #49705
Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/pipe.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index f3b1185c6ea..df1dd7401af 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -236,7 +236,7 @@ enum State { impl<'a> AsyncPipe<'a> { fn new(pipe: Handle, dst: &'a mut Vec<u8>) -> io::Result<AsyncPipe<'a>> { // Create an event which we'll use to coordinate our overlapped - // opreations, this event will be used in WaitForMultipleObjects + // operations, this event will be used in WaitForMultipleObjects // and passed as part of the OVERLAPPED handle. // // Note that we do a somewhat clever thing here by flagging the |