wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-23 06:54:45 +03:00
Code Issues Projects Releases Wiki Activity

fixup build on windows

Browse Source
This commit is contained in:
Wez Furlong 2021-05-23 14:34:31 -07:00
parent f78190ec9c
commit 5aa1912a5c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
filedescriptor/src/windows.rs
View File

@ -1,7 +1,7 @@
use crate::{
AsRawFileDescriptor, AsRawSocketDescriptor, FileDescriptor, FromRawFileDescriptor,
AsRawFileDescriptor, AsRawSocketDescriptor, Error, FileDescriptor, FromRawFileDescriptor,
FromRawSocketDescriptor, IntoRawFileDescriptor, IntoRawSocketDescriptor, OwnedHandle, Pipe,
StdioDescriptor,
Result, StdioDescriptor,
};
use std::io::{self, Error as IoError};
use std::os::windows::prelude::*;
@ -323,7 +323,7 @@ impl FromRawSocket for FileDescriptor {
}
impl io::Read for FileDescriptor {
fn read(&mut self, buf: &mut [u8]) -> Result<usize, io::Error> {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
if self.handle.is_socket_handle() {
// It's important to use the winsock functions to read/write
// even though ReadFile and WriteFile technically work; only
@ -367,7 +367,7 @@ impl io::Read for FileDescriptor {
}
impl io::Write for FileDescriptor {
fn write(&mut self, buf: &[u8]) -> Result<usize, io::Error> {
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
if self.handle.is_socket_handle() {
let num_wrote = unsafe {
send(
@ -400,7 +400,7 @@ impl io::Write for FileDescriptor {
}
}
}
fn flush(&mut self) -> Result<(), io::Error> {
fn flush(&mut self) -> std::io::Result<()> {
Ok(())
}
}