wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-09 11:37:19 +03:00
Code Issues Projects Releases Wiki Activity

fixup windows build for pty mod -> crate move

Browse Source 
Refs: https://github.com/wez/wezterm/issues/27
This commit is contained in:
Wez Furlong 2019-05-19 18:55:10 -07:00
parent 7bf1d99d77
commit 7464965d1e
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pty/Cargo.toml
View File

@ -20,6 +20,8 @@ default = []
serde_support = ["serde", "serde_derive"]
[target."cfg(windows)".dependencies]
bitflags = "1.0"
lazy_static = "1.3"
shared_library = "0.1"
uds_windows = "0.1"
winapi = { version = "0.3", features = [

2
pty/src/cmdbuilder.rs
View File

@ -1,5 +1,5 @@
#[cfg(windows)]
use failure::Error;
use failure::{ensure, Error};
use std::ffi::{OsStr, OsString};
#[cfg(windows)]
use std::os::windows::ffi::OsStrExt;

2
pty/src/win/conpty.rs
View File

@ -2,7 +2,7 @@ use super::ownedhandle::OwnedHandle;
use super::WinChild;
use crate::cmdbuilder::CommandBuilder;
use crate::{Child, MasterPty, PtySize, PtySystem, SlavePty};
use failure::Error;
use failure::{bail, ensure, Error};
use lazy_static::lazy_static;
use shared_library::shared_library;
use std::ffi::OsString;

6
pty/src/win/winpty/mod.rs
View File

@ -1,9 +1,11 @@
use super::ownedhandle::OwnedHandle;
use super::WinChild;
use crate::cmdbuilder::CommandBuilder;
use crate::win::winpty::safe::{
AgentFlags, MouseMode, SpawnConfig, SpawnFlags, Timeout, WinPty, WinPtyConfig,
};
use crate::{Child, MasterPty, PtySize, PtySystem, SlavePty};
use failure::Error;
use safe::{AgentFlags, MouseMode, SpawnConfig, SpawnFlags, Timeout, WinPty, WinPtyConfig};
use failure::{bail, Error};
use std::ffi::OsString;
use std::os::windows::ffi::OsStringExt;
use std::path::Path;

2
pty/src/win/winpty/safe.rs
View File

@ -5,7 +5,7 @@
use super::sys::*;
use crate::win::ownedhandle::OwnedHandle;
use bitflags::bitflags;
use failure::{format_err, Error};
use failure::{bail, ensure, format_err, Error};
use std::ffi::{OsStr, OsString};
use std::os::windows::ffi::{OsStrExt, OsStringExt};
use std::ptr;