diff options
| author | bors <bors@rust-lang.org> | 2020-03-31 22:28:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-31 22:28:18 +0000 |
| commit | 58dd1ce8383aaebcad9b6027b89a316fd868b35c (patch) | |
| tree | 21ba3ae00a56b802477ae80fbbeec3187dfe1c5f /src/libstd | |
| parent | a5b09d35473615e7142f5570f5c5fad0caf68bd2 (diff) | |
| parent | 8310320ebd68d5f23ad21bb5a15326abeaf91dff (diff) | |
| download | rust-58dd1ce8383aaebcad9b6027b89a316fd868b35c.tar.gz rust-58dd1ce8383aaebcad9b6027b89a316fd868b35c.zip | |
Auto merge of #70638 - Dylan-DPC:rollup-2tgfxjt, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #68770 (BTreeMap/BTreeSet: implement drain_filter ) - #70081 (add `unused_braces` lint) - #70556 (parse_and_disallow_postfix_after_cast: account for `ExprKind::Err`.) - #70605 (Add missing -lmsvcrt on mingw after -lpthread) - #70630 (Update books.) - #70632 (expand vec![] to Vec::new()) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/windows/handle.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/sys/windows/handle.rs b/src/libstd/sys/windows/handle.rs index f2ad057b6b6..d00381792e3 100644 --- a/src/libstd/sys/windows/handle.rs +++ b/src/libstd/sys/windows/handle.rs @@ -115,8 +115,7 @@ impl RawHandle { ) -> io::Result<Option<usize>> { let len = cmp::min(buf.len(), <c::DWORD>::max_value() as usize) as c::DWORD; let mut amt = 0; - let res = - cvt({ c::ReadFile(self.0, buf.as_ptr() as c::LPVOID, len, &mut amt, overlapped) }); + let res = cvt(c::ReadFile(self.0, buf.as_ptr() as c::LPVOID, len, &mut amt, overlapped)); match res { Ok(_) => Ok(Some(amt as usize)), Err(e) => { @@ -139,7 +138,7 @@ impl RawHandle { unsafe { let mut bytes = 0; let wait = if wait { c::TRUE } else { c::FALSE }; - let res = cvt({ c::GetOverlappedResult(self.raw(), overlapped, &mut bytes, wait) }); + let res = cvt(c::GetOverlappedResult(self.raw(), overlapped, &mut bytes, wait)); match res { Ok(_) => Ok(bytes as usize), Err(e) => { |
