diff options
| -rw-r--r-- | Cargo.lock | 285 | ||||
| -rw-r--r-- | Cargo.toml | 105 | ||||
| -rw-r--r-- | INSTALL.md | 2 | ||||
| -rw-r--r-- | alacritty/Cargo.toml | 49 | ||||
| -rw-r--r-- | alacritty/src/logging.rs (renamed from src/logging.rs) | 6 | ||||
| -rw-r--r-- | alacritty/src/main.rs (renamed from src/main.rs) | 25 | ||||
| -rw-r--r-- | alacritty_terminal/Cargo.toml | 68 | ||||
| -rw-r--r-- | alacritty_terminal/build.rs | 28 | ||||
| -rw-r--r-- | alacritty_terminal/src/ansi.rs (renamed from src/ansi.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/cli.rs (renamed from src/cli.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/config/bindings.rs (renamed from src/config/bindings.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/config/mod.rs (renamed from src/config/mod.rs) | 2 | ||||
| -rw-r--r-- | alacritty_terminal/src/cursor.rs (renamed from src/cursor.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/display.rs (renamed from src/display.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/event.rs (renamed from src/event.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/event_loop.rs (renamed from src/event_loop.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/grid/mod.rs (renamed from src/grid/mod.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/grid/row.rs (renamed from src/grid/row.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/grid/storage.rs (renamed from src/grid/storage.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/grid/tests.rs (renamed from src/grid/tests.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/index.rs (renamed from src/index.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/input.rs (renamed from src/input.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/lib.rs (renamed from src/lib.rs) | 1 | ||||
| -rw-r--r-- | alacritty_terminal/src/locale.rs (renamed from src/locale.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/macros.rs (renamed from src/macros.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/message_bar.rs (renamed from src/message_bar.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/meter.rs (renamed from src/meter.rs) | 2 | ||||
| -rw-r--r-- | alacritty_terminal/src/panic.rs (renamed from src/panic.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/renderer/mod.rs (renamed from src/renderer/mod.rs) | 20 | ||||
| -rw-r--r-- | alacritty_terminal/src/renderer/rects.rs (renamed from src/renderer/rects.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/selection.rs (renamed from src/selection.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/sync.rs (renamed from src/sync.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/term/cell.rs (renamed from src/term/cell.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/term/color.rs (renamed from src/term/color.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/term/mod.rs (renamed from src/term/mod.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/tty/mod.rs (renamed from src/tty/mod.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/tty/unix.rs (renamed from src/tty/unix.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/tty/windows/conpty.rs (renamed from src/tty/windows/conpty.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/tty/windows/mod.rs (renamed from src/tty/windows/mod.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/tty/windows/winpty.rs (renamed from src/tty/windows/winpty.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/url.rs (renamed from src/url.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/util.rs (renamed from src/util.rs) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/src/window.rs (renamed from src/window.rs) | 2 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref.rs (renamed from tests/ref.rs) | 18 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/csi_rep/alacritty.recording (renamed from tests/ref/csi_rep/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/csi_rep/grid.json (renamed from tests/ref/csi_rep/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/csi_rep/size.json (renamed from tests/ref/csi_rep/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/fish_cc/alacritty.recording (renamed from tests/ref/fish_cc/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/fish_cc/grid.json (renamed from tests/ref/fish_cc/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/fish_cc/size.json (renamed from tests/ref/fish_cc/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/grid_reset/alacritty.recording (renamed from tests/ref/grid_reset/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/grid_reset/config.json (renamed from tests/ref/grid_reset/config.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/grid_reset/grid.json (renamed from tests/ref/grid_reset/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/grid_reset/size.json (renamed from tests/ref/grid_reset/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/history/alacritty.recording (renamed from tests/ref/history/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/history/config.json (renamed from tests/ref/history/config.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/history/grid.json (renamed from tests/ref/history/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/history/size.json (renamed from tests/ref/history/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/indexed_256_colors/alacritty.recording (renamed from tests/ref/indexed_256_colors/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/indexed_256_colors/grid.json (renamed from tests/ref/indexed_256_colors/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/indexed_256_colors/size.json (renamed from tests/ref/indexed_256_colors/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/issue_855/alacritty.recording (renamed from tests/ref/issue_855/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/issue_855/grid.json (renamed from tests/ref/issue_855/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/issue_855/size.json (renamed from tests/ref/issue_855/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/ll/alacritty.recording (renamed from tests/ref/ll/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/ll/grid.json (renamed from tests/ref/ll/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/ll/size.json (renamed from tests/ref/ll/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/alacritty.recording (renamed from tests/ref/newline_with_cursor_beyond_scroll_region/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/grid.json (renamed from tests/ref/newline_with_cursor_beyond_scroll_region/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/size.json (renamed from tests/ref/newline_with_cursor_beyond_scroll_region/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tab_rendering/alacritty.recording (renamed from tests/ref/tab_rendering/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tab_rendering/grid.json (renamed from tests/ref/tab_rendering/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tab_rendering/size.json (renamed from tests/ref/tab_rendering/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tmux_git_log/alacritty.recording (renamed from tests/ref/tmux_git_log/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tmux_git_log/grid.json (renamed from tests/ref/tmux_git_log/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tmux_git_log/size.json (renamed from tests/ref/tmux_git_log/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tmux_htop/alacritty.recording (renamed from tests/ref/tmux_htop/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tmux_htop/grid.json (renamed from tests/ref/tmux_htop/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/tmux_htop/size.json (renamed from tests/ref/tmux_htop/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_24bitcolors_bce/alacritty.recording (renamed from tests/ref/vim_24bitcolors_bce/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_24bitcolors_bce/grid.json (renamed from tests/ref/vim_24bitcolors_bce/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_24bitcolors_bce/size.json (renamed from tests/ref/vim_24bitcolors_bce/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_large_window_scroll/alacritty.recording (renamed from tests/ref/vim_large_window_scroll/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_large_window_scroll/grid.json (renamed from tests/ref/vim_large_window_scroll/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_large_window_scroll/size.json (renamed from tests/ref/vim_large_window_scroll/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_simple_edit/alacritty.recording (renamed from tests/ref/vim_simple_edit/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_simple_edit/grid.json (renamed from tests/ref/vim_simple_edit/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vim_simple_edit/size.json (renamed from tests/ref/vim_simple_edit/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_cursor_movement_1/alacritty.recording (renamed from tests/ref/vttest_cursor_movement_1/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_cursor_movement_1/grid.json (renamed from tests/ref/vttest_cursor_movement_1/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_cursor_movement_1/size.json (renamed from tests/ref/vttest_cursor_movement_1/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_insert/alacritty.recording (renamed from tests/ref/vttest_insert/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_insert/grid.json (renamed from tests/ref/vttest_insert/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_insert/size.json (renamed from tests/ref/vttest_insert/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_origin_mode_1/alacritty.recording (renamed from tests/ref/vttest_origin_mode_1/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_origin_mode_1/grid.json (renamed from tests/ref/vttest_origin_mode_1/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_origin_mode_1/size.json (renamed from tests/ref/vttest_origin_mode_1/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_origin_mode_2/alacritty.recording (renamed from tests/ref/vttest_origin_mode_2/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_origin_mode_2/grid.json (renamed from tests/ref/vttest_origin_mode_2/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_origin_mode_2/size.json (renamed from tests/ref/vttest_origin_mode_2/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_scroll/alacritty.recording (renamed from tests/ref/vttest_scroll/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_scroll/grid.json (renamed from tests/ref/vttest_scroll/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_scroll/size.json (renamed from tests/ref/vttest_scroll/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_tab_clear_set/alacritty.recording (renamed from tests/ref/vttest_tab_clear_set/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_tab_clear_set/grid.json (renamed from tests/ref/vttest_tab_clear_set/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/vttest_tab_clear_set/size.json (renamed from tests/ref/vttest_tab_clear_set/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/zerowidth/alacritty.recording (renamed from tests/ref/zerowidth/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/zerowidth/config.json (renamed from tests/ref/zerowidth/config.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/zerowidth/grid.json (renamed from tests/ref/zerowidth/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/zerowidth/size.json (renamed from tests/ref/zerowidth/size.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/zsh_tab_completion/alacritty.recording (renamed from tests/ref/zsh_tab_completion/alacritty.recording) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/zsh_tab_completion/grid.json (renamed from tests/ref/zsh_tab_completion/grid.json) | 0 | ||||
| -rw-r--r-- | alacritty_terminal/tests/ref/zsh_tab_completion/size.json (renamed from tests/ref/zsh_tab_completion/size.json) | 0 | ||||
| -rw-r--r-- | build.rs | 83 | ||||
| -rwxr-xr-x | ci/before_deploy.sh | 4 | ||||
| -rwxr-xr-x | ci/script.sh | 27 | ||||
| -rw-r--r-- | copypasta/src/x11.rs | 21 | ||||
| -rw-r--r-- | winpty/Cargo.toml | 7 | ||||
| -rw-r--r-- | winpty/build.rs | 71 | ||||
| -rw-r--r-- | winpty/src/windows.rs | 5 |
120 files changed, 398 insertions, 433 deletions
@@ -1,14 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] -name = "MacTypes-sys" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "adler32" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -33,6 +25,19 @@ dependencies = [ name = "alacritty" version = "0.3.2" dependencies = [ + "alacritty_terminal 0.3.2", + "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "alacritty_terminal" +version = "0.3.2" +dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -40,15 +45,13 @@ dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "dunce 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "errno 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "font 0.1.0", "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "glutin 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "mio-anonymous-pipes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -59,16 +62,13 @@ dependencies = [ "notify 4.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "reqwest 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "serde_yaml 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "static_assertions 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "terminfo 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "vte 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -77,7 +77,6 @@ dependencies = [ "winpty 0.1.0", "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)", "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zip 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -141,7 +140,7 @@ name = "atty" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -159,7 +158,7 @@ dependencies = [ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -170,7 +169,7 @@ version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -248,7 +247,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -257,7 +256,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -287,7 +286,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -296,7 +295,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -360,7 +359,7 @@ dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -414,28 +413,11 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core-foundation" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "core-foundation-sys" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -451,7 +433,7 @@ dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -462,7 +444,7 @@ dependencies = [ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -574,9 +556,9 @@ name = "derivative" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -584,7 +566,7 @@ name = "dirs" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -618,7 +600,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -676,7 +658,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "errno-dragonfly 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -686,7 +668,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -711,9 +693,9 @@ name = "euclid_macros" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -739,19 +721,19 @@ name = "failure_derive" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "filetime" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -761,7 +743,7 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -782,7 +764,7 @@ dependencies = [ "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "freetype-rs 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -807,7 +789,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "freetype-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -815,7 +797,7 @@ name = "freetype-sys" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -827,7 +809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -835,7 +817,7 @@ name = "fsevent-sys" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1031,12 +1013,12 @@ dependencies = [ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1049,7 +1031,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.27 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1075,7 +1057,7 @@ dependencies = [ "num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)", "num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tiff 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1100,7 +1082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1108,7 +1090,7 @@ name = "inotify-sys" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1116,7 +1098,7 @@ name = "iovec" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1160,7 +1142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libc" -version = "0.2.51" +version = "0.2.53" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1188,7 +1170,7 @@ version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1233,7 +1215,7 @@ name = "malloc_buf" version = "0.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1246,7 +1228,7 @@ name = "memchr" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1259,7 +1241,7 @@ name = "memmap" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1302,7 +1284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1316,7 +1298,7 @@ dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1363,7 +1345,7 @@ version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1398,18 +1380,18 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "openssl 0.10.20 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1419,7 +1401,7 @@ version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1431,7 +1413,7 @@ dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1463,12 +1445,12 @@ version = "4.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", "fsevent-sys 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1477,12 +1459,12 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1521,7 +1503,7 @@ name = "num_cpus" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1564,7 +1546,7 @@ dependencies = [ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1579,7 +1561,7 @@ version = "0.9.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1623,7 +1605,7 @@ name = "parking_lot_core" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1682,7 +1664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "png" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1698,7 +1680,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "proc-macro2" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1731,7 +1713,7 @@ name = "quote" version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1740,7 +1722,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1795,7 +1777,7 @@ name = "rand_jitter" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1807,7 +1789,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1847,7 +1829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1949,15 +1931,15 @@ dependencies = [ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2021,23 +2003,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "security-framework" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", + "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "security-framework-sys" -version = "0.2.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2063,9 +2043,9 @@ name = "serde_derive" version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2105,7 +2085,7 @@ name = "servo-fontconfig" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig-sys 4.0.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2132,7 +2112,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2141,7 +2121,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2183,7 +2163,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2223,10 +2203,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syn" -version = "0.15.32" +version = "0.15.33" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2236,9 +2216,9 @@ name = "synstructure" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2248,7 +2228,7 @@ version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2279,7 +2259,7 @@ name = "termion" version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2308,7 +2288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "lzw 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2317,14 +2297,14 @@ name = "time" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2336,7 +2316,7 @@ dependencies = [ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2384,12 +2364,12 @@ dependencies = [ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-sync" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2411,7 +2391,7 @@ dependencies = [ [[package]] name = "tokio-threadpool" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2557,7 +2537,7 @@ name = "vswhom" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2567,7 +2547,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2605,7 +2585,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "downcast-rs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-commons 0.21.12 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-scanner 0.21.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2638,7 +2618,7 @@ name = "wayland-scanner" version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2657,7 +2637,7 @@ name = "which" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2724,7 +2704,7 @@ dependencies = [ "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2740,10 +2720,14 @@ name = "winpty" version = "0.1.0" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "named_pipe 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "reqwest 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winpty-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "zip 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2786,7 +2770,7 @@ version = "2.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2795,7 +2779,7 @@ name = "xcb" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2830,7 +2814,6 @@ dependencies = [ ] [metadata] -"checksum MacTypes-sys 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaf9f0d0b1cc33a4d2aee14fb4b2eac03462ef4db29c8ac4057327d8a71ad86f" "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" "checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5" "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" @@ -2871,9 +2854,7 @@ dependencies = [ "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" "checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf" "checksum cookie_store 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b0d2f2ecb21dce00e2453268370312978af9b8024020c7a37ae2cc6dbbe64685" -"checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980" "checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -"checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" "checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" "checksum core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)" = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9" "checksum core-text 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d95a72b5e50e549969dd88eff3047495fe5b8c6f028635442c2b708be707e669" @@ -2908,7 +2889,7 @@ dependencies = [ "checksum expat-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" -"checksum filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646" +"checksum filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f8c63033fcba1f51ef744505b3cad42510432b904c062afa67ad7ece008429d" "checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa" "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" @@ -2952,7 +2933,7 @@ dependencies = [ "checksum khronos_api 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" -"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917" +"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee" "checksum libflate 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "c52384aeb22d0ce82a10d8ddf35f7fb4717d1b23eac5b94cd38d2050fb53766a" "checksum libloading 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3ad660d7cb8c5822cd83d10897b0f1f1526792737a179e73896152f85b88c2" "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" @@ -2979,14 +2960,14 @@ dependencies = [ "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" "checksum named_pipe 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ed10a5ac4f5f7e5d75552b12c1d5d542debca81e573279dd1e4c19fde6efa6d" -"checksum native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2" +"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" "checksum nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b" "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" "checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" "checksum notify 4.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "abb1581693e44d8a0ec347ef12289625063f52a1dddc3f3c9befd5fc59e88943" -"checksum num-derive 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fe8fcafd1b86a37ce8a1cfa15ae504817e0c8c2e7ad42767371461ac1d316d" +"checksum num-derive 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" "checksum num-iter 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "af3fdbbc3291a5464dc57b03860ec37ca6bf915ed6ee385e7c6c052c422b2124" "checksum num-rational 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e96f040177bb3da242b5b1ecf3f54b5d5af3efbbfb18608977a5d2767b22f10" @@ -3011,9 +2992,9 @@ dependencies = [ "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" -"checksum png 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9adebf7fb91ccf5eac9da1a8e00e83cb8ae882c3e8d8e4ad59da73cb8c82a2c9" +"checksum png 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "63daf481fdd0defa2d1d2be15c674fbfa1b0fd71882c303a91f9a79b3252c359" "checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" -"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" +"checksum proc-macro2 0.4.28 (registry+https://github.com/rust-lang/crates.io-index)" = "ba92c84f814b3f9a44c5cfca7d2ad77fa10710867d2bbb1b3d175ab5f47daa12" "checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" @@ -3048,8 +3029,8 @@ dependencies = [ "checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" -"checksum security-framework 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfab8dda0e7a327c696d893df9ffa19cadc4bd195797997f5223cf5831beaf05" -"checksum security-framework-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3d6696852716b589dff9e886ff83778bb635150168e83afa8ac6b8a78cb82abc" +"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" +"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4" @@ -3072,7 +3053,7 @@ dependencies = [ "checksum stb_truetype 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "69b7df505db8e81d54ff8be4693421e5b543e08214bd8d99eb761fcb4d5668ba" "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum syn 0.15.32 (registry+https://github.com/rust-lang/crates.io-index)" = "846620ec526c1599c070eff393bfeeeb88a93afa2513fc3b49f1fea84cf7b0ed" +"checksum syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)" = "ec52cd796e5f01d0067225a5392e70084acc4c0013fa71d55166d38a8b307836" "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015" "checksum tempfile 3.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b86c784c88d98c801132806dadd3819ed29d8600836c4088e855cdf3e178ed8a" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" @@ -3082,14 +3063,14 @@ dependencies = [ "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" "checksum tiff 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4834f28a0330cb9f3f2c87d2649dca723cb33802e2bdcf18da32759fbec7ce" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -"checksum tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "65641e515a437b308ab131a82ce3042ff9795bef5d6c5a9be4eb24195c417fd9" +"checksum tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cec6c34409089be085de9403ba2010b80e36938c9ca992c4f67f407bb13db0b1" "checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" "checksum tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e" "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" "checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" -"checksum tokio-sync 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fda385df506bf7546e70872767f71e81640f1f251bdf2fd8eb81a0eaec5fe022" +"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a" "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" -"checksum tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ec5759cf26cf9659555f36c431b515e3d05f66831741c85b4b5d5dfb9cf1323c" +"checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2" "checksum tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2910970404ba6fa78c5539126a9ae2045d62e3713041e447f695f41405a120c6" "checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3" "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" @@ -1,117 +1,16 @@ -[package] -name = "alacritty" -version = "0.3.2" -authors = ["Joe Wilm <joe@jwilm.com>"] -license = "Apache-2.0" -build = "build.rs" -description = "GPU-accelerated terminal emulator" -readme = "README.md" -homepage = "https://github.com/jwilm/alacritty" -edition = "2018" - [workspace] members = [ + "alacritty", + "alacritty_terminal", "font", "copypasta", "winpty" ] -[[bin]] -doc = false -path = "src/main.rs" -name = "alacritty" - -[dependencies] -libc = "0.2" -notify = "4" -bitflags = "1" -font = { path = "./font" } -errno = "0.2" -parking_lot = "0.7" -serde = "1" -serde_derive = "1" -serde_json = "1" -serde_yaml = "0.8" -vte = "0.3" -mio = "0.6" -mio-extras = "2" -copypasta = { path = "./copypasta" } -xdg = "2" -log = "0.4" -clap = "2" -fnv = "1" -unicode-width = "0.1" -glutin = { version = "0.21.0", features = ["icon_loading"] } -env_logger = "0.6.0" -base64 = "0.10.0" -static_assertions = "0.3.0" -terminfo = "0.6.1" -url = "1.7.1" -time = "0.1.40" -crossbeam-channel = "0.3.8" - -[target.'cfg(unix)'.dependencies] -nix = "0.13" -signal-hook = { version = "0.1", features = ["mio-support"] } - -[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies] -x11-dl = "2" - -[target.'cfg(windows)'.dependencies] -winpty = { path = "./winpty" } -mio-named-pipes = "0.1" -miow = "0.3" -dunce = "1.0" -winapi = { version = "0.3.7", features = ["impl-default", "winuser", "synchapi", "roerrorapi", "winerror", "wincon", "wincontypes"]} -dirs = "1.0" -widestring = "0.4" -mio-anonymous-pipes = "0.1" -image = "0.21.0" - -[target.'cfg(target_os = "macos")'.dependencies] -objc = "0.2.2" -dirs = "1.0.2" - -[features] -default = [] -# Enabling this feature makes shaders automatically reload when changed -live-shader-reload = [] -nightly = [] -bench = [] - -[build-dependencies] -gl_generator = "0.11.0" - -[target.'cfg(windows)'.build-dependencies] -embed-resource = "1.1.4" -tempfile = "3.0.4" -reqwest = "0.9" -zip = "0.5" - [profile.release] lto = true debug = 1 incremental = false -[package.metadata.deb] -maintainer = "Joe Wilm <joe@jwilm.com>" -license-file = ["LICENSE-APACHE", "3"] -extended-description = """\ -Alacritty is the fastest terminal emulator in existence. Using the GPU for \ -rendering enables optimizations that simply aren't possible without it. """ -depends = "$auto" -section = "rust" -priority = "optional" -assets = [ - ["target/release/alacritty", "usr/bin/", "755"], - ["extra/linux/alacritty.desktop", "usr/share/applications/", "644"], - ["extra/logo/alacritty-term.svg", "usr/share/pixmaps/Alacritty.svg", "644"], - ["extra/completions/alacritty.bash", "usr/share/bash-completion/completions/alacritty", "644"], - ["extra/completions/alacritty.fish", "usr/share/fish/completions/alacritty.fish", "644"], - ["extra/completions/_alacritty", "usr/share/zsh/vendor-completions/_alacritty", "644"], - ["extra/alacritty.info", "usr/share/terminfo/a/alacritty", "644"], -] -maintainer-scripts = "extra/linux/debian" - [patch.crates-io] servo-freetype-sys = { path = "servo-freetype-proxy" } @@ -228,7 +228,7 @@ Using `cargo deb`, you can create and install a deb file. ```sh cargo install cargo-deb -cargo deb --install +cargo deb --install --manifest-path alacritty/Cargo.toml ``` To choose a default terminal app, use Debian's `update-alternatives`. diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml new file mode 100644 index 00000000..bf0e3622 --- /dev/null +++ b/alacritty/Cargo.toml @@ -0,0 +1,49 @@ +[package] +name = "alacritty" +version = "0.3.2" +authors = ["Joe Wilm <joe@jwilm.com>"] +license = "Apache-2.0" +description = "GPU-accelerated terminal emulator" +readme = "../README.md" +homepage = "https://github.com/jwilm/alacritty" +edition = "2018" + +[dependencies] +alacritty_terminal = { path = "../alacritty_terminal" } +log = "0.4" +time = "0.1.40" +env_logger = "0.6.0" +crossbeam-channel = "0.3.8" + +[target.'cfg(target_os = "macos")'.dependencies] +dirs = "1.0.2" + +[target.'cfg(windows)'.dependencies] +winapi = { version = "0.3.7", features = ["impl-default", "winuser", "synchapi", "roerrorapi", "winerror", "wincon", "wincontypes"]} + +[features] +default = [] +# Enabling this feature makes shaders automatically reload when changed +live-shader-reload = ["alacritty_terminal/live-shader-reload"] +nightly = [] +bench = [] + +[package.metadata.deb] +maintainer = "Joe Wilm <joe@jwilm.com>" +license-file = ["LICENSE-APACHE", "3"] +extended-description = """\ +Alacritty is the fastest terminal emulator in existence. Using the GPU for \ +rendering enables optimizations that simply aren't possible without it. """ +depends = "$auto" +section = "rust" +priority = "optional" +assets = [ + ["../target/release/alacritty", "usr/bin/", "755"], + ["../extra/linux/alacritty.desktop", "usr/share/applications/", "644"], + ["../extra/logo/alacritty-term.svg", "usr/share/pixmaps/Alacritty.svg", "644"], + ["../extra/completions/alacritty.bash", "usr/share/bash-completion/completions/alacritty", "644"], + ["../extra/completions/alacritty.fish", "usr/share/fish/completions/alacritty.fish", "644"], + ["../extra/completions/_alacritty", "usr/share/zsh/vendor-completions/_alacritty", "644"], + ["../extra/alacritty.info", "usr/share/terminfo/a/alacritty", "644"], +] +maintainer-scripts = "../extra/linux/debian" diff --git a/src/logging.rs b/alacritty/src/logging.rs index c6ddd8e6..9c2041f0 100644 --- a/src/logging.rs +++ b/alacritty/src/logging.rs @@ -29,9 +29,9 @@ use crossbeam_channel::Sender; use log::{self, Level}; use time; -use crate::cli; -use crate::message_bar::Message; -use crate::term::color; +use alacritty_terminal::cli; +use alacritty_terminal::message_bar::Message; +use alacritty_terminal::term::color; const ALACRITTY_LOG_ENV: &str = "ALACRITTY_LOG"; diff --git a/src/main.rs b/alacritty/src/main.rs index d7e335e2..7a200a8b 100644 --- a/src/main.rs +++ b/alacritty/src/main.rs @@ -41,19 +41,20 @@ use std::env; #[cfg(not(windows))] use std::os::unix::io::AsRawFd; -use alacritty::config::{self, Config, Monitor}; -use alacritty::display::Display; -use alacritty::event_loop::{self, EventLoop, Msg}; +use alacritty_terminal::config::{self, Config, Monitor}; +use alacritty_terminal::display::Display; +use alacritty_terminal::event_loop::{self, EventLoop, Msg}; #[cfg(target_os = "macos")] -use alacritty::locale; -use alacritty::logging; -use alacritty::message_bar::MessageBuffer; -use alacritty::panic; -use alacritty::sync::FairMutex; -use alacritty::term::Term; -use alacritty::tty; -use alacritty::util::fmt::Red; -use alacritty::{cli, die, event}; +use alacritty_terminal::locale; +use alacritty_terminal::message_bar::MessageBuffer; +use alacritty_terminal::panic; +use alacritty_terminal::sync::FairMutex; +use alacritty_terminal::term::Term; +use alacritty_terminal::tty; +use alacritty_terminal::util::fmt::Red; +use alacritty_terminal::{cli, die, event}; + +mod logging; fn main() { panic::attach_handler(); diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml new file mode 100644 index 00000000..cda79c1b --- /dev/null +++ b/alacritty_terminal/Cargo.toml @@ -0,0 +1,68 @@ +[package] +name = "alacritty_terminal" +version = "0.3.2" +authors = ["Joe Wilm <joe@jwilm.com>"] +license = "Apache-2.0" +build = "build.rs" +description = "Library for writing terminal emulators" +readme = "../README.md" +homepage = "https://github.com/jwilm/alacritty" +edition = "2018" + +[dependencies] +libc = "0.2" +notify = "4" +bitflags = "1" +font = { path = "../font" } +errno = "0.2" +parking_lot = "0.7" +serde = "1" +serde_derive = "1" +serde_json = "1" +serde_yaml = "0.8" +vte = "0.3" +mio = "0.6" +mio-extras = "2" +copypasta = { path = "../copypasta" } +xdg = "2" +log = "0.4" +clap = "2" +fnv = "1" +unicode-width = "0.1" +glutin = { version = "0.21.0", features = ["icon_loading"] } +base64 = "0.10.0" +static_assertions = "0.3.0" +terminfo = "0.6.1" +url = "1.7.1" +crossbeam-channel = "0.3.8" + +[target.'cfg(unix)'.dependencies] +nix = "0.13" +signal-hook = { version = "0.1", features = ["mio-support"] } + +[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies] +x11-dl = "2" + +[target.'cfg(windows)'.dependencies] +winpty = { path = "../winpty" } +mio-named-pipes = "0.1" +miow = "0.3" +dunce = "1.0" +winapi = { version = "0.3.7", features = ["impl-default", "winuser", "synchapi", "roerrorapi", "winerror", "wincon", "wincontypes"]} +dirs = "1.0" +widestring = "0.4" +mio-anonymous-pipes = "0.1" +image = "0.21.0" + +[target.'cfg(target_os = "macos")'.dependencies] +objc = "0.2.2" + +[features] +default = [] +# Enabling this feature makes shaders automatically reload when changed +live-shader-reload = [] +nightly = [] +bench = [] + +[build-dependencies] +gl_generator = "0.11.0" diff --git a/alacritty_terminal/build.rs b/alacritty_terminal/build.rs new file mode 100644 index 00000000..5d5bc451 --- /dev/null +++ b/alacritty_terminal/build.rs @@ -0,0 +1,28 @@ +// Copyright 2016 Joe Wilm, The Alacritty Project Contributors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +use gl_generator::{Api, Fallbacks, GlobalGenerator, Profile, Registry}; + +use std::env; +use std::fs::File; +use std::path::Path; + +fn main() { + let dest = env::var("OUT_DIR").unwrap(); + let mut file = File::create(&Path::new(&dest).join("gl_bindings.rs")).unwrap(); + + Registry::new(Api::Gl, (4, 5), Profile::Core, Fallbacks::All, ["GL_ARB_blend_func_extended"]) + .write_bindings(GlobalGenerator, &mut file) + .unwrap(); +} diff --git a/src/ansi.rs b/alacritty_terminal/src/ansi.rs index c0ebb79c..c0ebb79c 100644 --- a/src/ansi.rs +++ b/alacritty_terminal/src/ansi.rs diff --git a/src/cli.rs b/alacritty_terminal/src/cli.rs index 2cddbc82..2cddbc82 100644 --- a/src/cli.rs +++ b/alacritty_terminal/src/cli.rs diff --git a/src/config/bindings.rs b/alacritty_terminal/src/config/bindings.rs index 7e69182b..7e69182b 100644 --- a/src/config/bindings.rs +++ b/alacritty_terminal/src/config/bindings.rs diff --git a/src/config/mod.rs b/alacritty_terminal/src/config/mod.rs index 4d6026ca..9502e3fd 100644 --- a/src/config/mod.rs +++ b/alacritty_terminal/src/config/mod.rs @@ -32,7 +32,7 @@ mod bindings; pub const SOURCE_FILE_PATH: &str = file!(); const MAX_SCROLLBACK_LINES: u32 = 100_000; static DEFAULT_ALACRITTY_CONFIG: &'static str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/alacritty.yml")); + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../alacritty.yml")); #[serde(default)] #[derive(Clone, Debug, Deserialize, PartialEq, Eq)] diff --git a/src/cursor.rs b/alacritty_terminal/src/cursor.rs index 196241a0..196241a0 100644 --- a/src/cursor.rs +++ b/alacritty_terminal/src/cursor.rs diff --git a/src/display.rs b/alacritty_terminal/src/display.rs index 1d5799f6..1d5799f6 100644 --- a/src/display.rs +++ b/alacritty_terminal/src/display.rs diff --git a/src/event.rs b/alacritty_terminal/src/event.rs index 1f3e9ca5..1f3e9ca5 100644 --- a/src/event.rs +++ b/alacritty_terminal/src/event.rs diff --git a/src/event_loop.rs b/alacritty_terminal/src/event_loop.rs index 4941b479..4941b479 100644 --- a/src/event_loop.rs +++ b/alacritty_terminal/src/event_loop.rs diff --git a/src/grid/mod.rs b/alacritty_terminal/src/grid/mod.rs index 3a6bacf8..3a6bacf8 100644 --- a/src/grid/mod.rs +++ b/alacritty_terminal/src/grid/mod.rs diff --git a/src/grid/row.rs b/alacritty_terminal/src/grid/row.rs index 88a23871..88a23871 100644 --- a/src/grid/row.rs +++ b/alacritty_terminal/src/grid/row.rs diff --git a/src/grid/storage.rs b/alacritty_terminal/src/grid/storage.rs index 32260426..32260426 100644 --- a/src/grid/storage.rs +++ b/alacritty_terminal/src/grid/storage.rs diff --git a/src/grid/tests.rs b/alacritty_terminal/src/grid/tests.rs index fc41fdc6..fc41fdc6 100644 --- a/src/grid/tests.rs +++ b/alacritty_terminal/src/grid/tests.rs diff --git a/src/index.rs b/alacritty_terminal/src/index.rs index f6ea4ad3..f6ea4ad3 100644 --- a/src/index.rs +++ b/alacritty_terminal/src/index.rs diff --git a/src/input.rs b/alacritty_terminal/src/input.rs index fc79b398..fc79b398 100644 --- a/src/input.rs +++ b/alacritty_terminal/src/input.rs diff --git a/src/lib.rs b/alacritty_terminal/src/lib.rs index 10c1faa6..ab1ba35e 100644 --- a/src/lib.rs +++ b/alacritty_terminal/src/lib.rs @@ -39,7 +39,6 @@ pub mod grid; pub mod index; pub mod input; pub mod locale; -pub mod logging; pub mod message_bar; pub mod meter; pub mod panic; diff --git a/src/locale.rs b/alacritty_terminal/src/locale.rs index 40c915b5..40c915b5 100644 --- a/src/locale.rs +++ b/alacritty_terminal/src/locale.rs diff --git a/src/macros.rs b/alacritty_terminal/src/macros.rs index 519f8b6a..519f8b6a 100644 --- a/src/macros.rs +++ b/alacritty_terminal/src/macros.rs diff --git a/src/message_bar.rs b/alacritty_terminal/src/message_bar.rs index 8883dcb0..8883dcb0 100644 --- a/src/message_bar.rs +++ b/alacritty_terminal/src/message_bar.rs diff --git a/src/meter.rs b/alacritty_terminal/src/meter.rs index 81da4442..19d7fe70 100644 --- a/src/meter.rs +++ b/alacritty_terminal/src/meter.rs @@ -20,7 +20,7 @@ //! //! ```rust //! // create a meter -//! let mut meter = alacritty::meter::Meter::new(); +//! let mut meter = alacritty_terminal::meter::Meter::new(); //! //! // Sample something. //! { diff --git a/src/panic.rs b/alacritty_terminal/src/panic.rs index 4d3524ed..4d3524ed 100644 --- a/src/panic.rs +++ b/alacritty_terminal/src/panic.rs diff --git a/src/renderer/mod.rs b/alacritty_terminal/src/renderer/mod.rs index c0e3081d..82c6c2df 100644 --- a/src/renderer/mod.rs +++ b/alacritty_terminal/src/renderer/mod.rs @@ -38,20 +38,24 @@ use crate::term::{self, cell, RenderableCell, RenderableCellContent}; pub mod rects; // Shader paths for live reload -static TEXT_SHADER_F_PATH: &'static str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.f.glsl"); -static TEXT_SHADER_V_PATH: &'static str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.v.glsl"); -static RECT_SHADER_F_PATH: &'static str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.f.glsl"); -static RECT_SHADER_V_PATH: &'static str = concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.v.glsl"); +static TEXT_SHADER_F_PATH: &'static str = + concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl"); +static TEXT_SHADER_V_PATH: &'static str = + concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl"); +static RECT_SHADER_F_PATH: &'static str = + concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl"); +static RECT_SHADER_V_PATH: &'static str = + concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl"); // Shader source which is used when live-shader-reload feature is disable static TEXT_SHADER_F: &'static str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.f.glsl")); + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.f.glsl")); static TEXT_SHADER_V: &'static str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/res/text.v.glsl")); + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/text.v.glsl")); static RECT_SHADER_F: &'static str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.f.glsl")); + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.f.glsl")); static RECT_SHADER_V: &'static str = - include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/res/rect.v.glsl")); + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../res/rect.v.glsl")); /// `LoadGlyph` allows for copying a rasterized glyph into graphics memory pub trait LoadGlyph { diff --git a/src/renderer/rects.rs b/alacritty_terminal/src/renderer/rects.rs index b4f8a012..b4f8a012 100644 --- a/src/renderer/rects.rs +++ b/alacritty_terminal/src/renderer/rects.rs diff --git a/src/selection.rs b/alacritty_terminal/src/selection.rs index d2009586..d2009586 100644 --- a/src/selection.rs +++ b/alacritty_terminal/src/selection.rs diff --git a/src/sync.rs b/alacritty_terminal/src/sync.rs index 0fcd0862..0fcd0862 100644 --- a/src/sync.rs +++ b/alacritty_terminal/src/sync.rs diff --git a/src/term/cell.rs b/alacritty_terminal/src/term/cell.rs index 4d2f4c1c..4d2f4c1c 100644 --- a/src/term/cell.rs +++ b/alacritty_terminal/src/term/cell.rs diff --git a/src/term/color.rs b/alacritty_terminal/src/term/color.rs index 39def612..39def612 100644 --- a/src/term/color.rs +++ b/alacritty_terminal/src/term/color.rs diff --git a/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs index 94b2ade2..94b2ade2 100644 --- a/src/term/mod.rs +++ b/alacritty_terminal/src/term/mod.rs diff --git a/src/tty/mod.rs b/alacritty_terminal/src/tty/mod.rs index ec175ee6..ec175ee6 100644 --- a/src/tty/mod.rs +++ b/alacritty_terminal/src/tty/mod.rs diff --git a/src/tty/unix.rs b/alacritty_terminal/src/tty/unix.rs index 0e3dc2fd..0e3dc2fd 100644 --- a/src/tty/unix.rs +++ b/alacritty_terminal/src/tty/unix.rs diff --git a/src/tty/windows/conpty.rs b/alacritty_terminal/src/tty/windows/conpty.rs index f23d78a7..f23d78a7 100644 --- a/src/tty/windows/conpty.rs +++ b/alacritty_terminal/src/tty/windows/conpty.rs diff --git a/src/tty/windows/mod.rs b/alacritty_terminal/src/tty/windows/mod.rs index c87c5257..c87c5257 100644 --- a/src/tty/windows/mod.rs +++ b/alacritty_terminal/src/tty/windows/mod.rs diff --git a/src/tty/windows/winpty.rs b/alacritty_terminal/src/tty/windows/winpty.rs index 10bd9d01..10bd9d01 100644 --- a/src/tty/windows/winpty.rs +++ b/alacritty_terminal/src/tty/windows/winpty.rs diff --git a/src/url.rs b/alacritty_terminal/src/url.rs index d3caf9fc..d3caf9fc 100644 --- a/src/url.rs +++ b/alacritty_terminal/src/url.rs diff --git a/src/util.rs b/alacritty_terminal/src/util.rs index b8703012..b8703012 100644 --- a/src/util.rs +++ b/alacritty_terminal/src/util.rs diff --git a/src/window.rs b/alacritty_terminal/src/window.rs index b6384600..89e455dc 100644 --- a/src/window.rs +++ b/alacritty_terminal/src/window.rs @@ -31,7 +31,7 @@ use crate::cli::Options; use crate::config::{Decorations, StartupMode, WindowConfig}; #[cfg(windows)] -static WINDOW_ICON: &'static [u8] = include_bytes!("../extra/windows/alacritty.ico"); +static WINDOW_ICON: &'static [u8] = include_bytes!("../../extra/windows/alacritty.ico"); /// Default Alacritty name, used for window title and class. pub const DEFAULT_NAME: &str = "Alacritty"; diff --git a/tests/ref.rs b/alacritty_terminal/tests/ref.rs index 4689ac54..4f97b9b8 100644 --- a/tests/ref.rs +++ b/alacritty_terminal/tests/ref.rs @@ -6,15 +6,15 @@ use std::fs::File; use std::io::{self, Read}; use std::path::Path; -use alacritty::ansi; -use alacritty::config::Config; -use alacritty::index::Column; -use alacritty::message_bar::MessageBuffer; -use alacritty::term::cell::Cell; -use alacritty::term::SizeInfo; -use alacritty::util::fmt::{Green, Red}; -use alacritty::Grid; -use alacritty::Term; +use alacritty_terminal::ansi; +use alacritty_terminal::config::Config; +use alacritty_terminal::index::Column; +use alacritty_terminal::message_bar::MessageBuffer; +use alacritty_terminal::term::cell::Cell; +use alacritty_terminal::term::SizeInfo; +use alacritty_terminal::util::fmt::{Green, Red}; +use alacritty_terminal::Grid; +use alacritty_terminal::Term; macro_rules! ref_tests { ($($name:ident)*) => { diff --git a/tests/ref/csi_rep/alacritty.recording b/alacritty_terminal/tests/ref/csi_rep/alacritty.recording index 9c78a0b6..9c78a0b6 100644 --- a/tests/ref/csi_rep/alacritty.recording +++ b/alacritty_terminal/tests/ref/csi_rep/alacritty.recording diff --git a/tests/ref/csi_rep/grid.json b/alacritty_terminal/tests/ref/csi_rep/grid.json index 31a948a3..31a948a3 100644 --- a/tests/ref/csi_rep/grid.json +++ b/alacritty_terminal/tests/ref/csi_rep/grid.json diff --git a/tests/ref/csi_rep/size.json b/alacritty_terminal/tests/ref/csi_rep/size.json index 99923ea7..99923ea7 100644 --- a/tests/ref/csi_rep/size.json +++ b/alacritty_terminal/tests/ref/csi_rep/size.json diff --git a/tests/ref/fish_cc/alacritty.recording b/alacritty_terminal/tests/ref/fish_cc/alacritty.recording index d6cae7b8..d6cae7b8 100644 --- a/tests/ref/fish_cc/alacritty.recording +++ b/alacritty_terminal/tests/ref/fish_cc/alacritty.recording diff --git a/tests/ref/fish_cc/grid.json b/alacritty_terminal/tests/ref/fish_cc/grid.json index 7d8a535f..7d8a535f 100644 --- a/tests/ref/fish_cc/grid.json +++ b/alacritty_terminal/tests/ref/fish_cc/grid.json diff --git a/tests/ref/fish_cc/size.json b/alacritty_terminal/tests/ref/fish_cc/size.json index ae4135f0..ae4135f0 100644 --- a/tests/ref/fish_cc/size.json +++ b/alacritty_terminal/tests/ref/fish_cc/size.json diff --git a/tests/ref/grid_reset/alacritty.recording b/alacritty_terminal/tests/ref/grid_reset/alacritty.recording index d84a929a..d84a929a 100644 --- a/tests/ref/grid_reset/alacritty.recording +++ b/alacritty_terminal/tests/ref/grid_reset/alacritty.recording diff --git a/tests/ref/grid_reset/config.json b/alacritty_terminal/tests/ref/grid_reset/config.json index e794493c..e794493c 100644 --- a/tests/ref/grid_reset/config.json +++ b/alacritty_terminal/tests/ref/grid_reset/config.json diff --git a/tests/ref/grid_reset/grid.json b/alacritty_terminal/tests/ref/grid_reset/grid.json index 731ce483..731ce483 100644 --- a/tests/ref/grid_reset/grid.json +++ b/alacritty_terminal/tests/ref/grid_reset/grid.json diff --git a/tests/ref/grid_reset/size.json b/alacritty_terminal/tests/ref/grid_reset/size.json index dd365a0f..dd365a0f 100644 --- a/tests/ref/grid_reset/size.json +++ b/alacritty_terminal/tests/ref/grid_reset/size.json diff --git a/tests/ref/history/alacritty.recording b/alacritty_terminal/tests/ref/history/alacritty.recording index 3bfba775..3bfba775 100644 --- a/tests/ref/history/alacritty.recording +++ b/alacritty_terminal/tests/ref/history/alacritty.recording diff --git a/tests/ref/history/config.json b/alacritty_terminal/tests/ref/history/config.json index 5cca8022..5cca8022 100644 --- a/tests/ref/history/config.json +++ b/alacritty_terminal/tests/ref/history/config.json diff --git a/tests/ref/history/grid.json b/alacritty_terminal/tests/ref/history/grid.json index 04b71d68..04b71d68 100644 --- a/tests/ref/history/grid.json +++ b/alacritty_terminal/tests/ref/history/grid.json diff --git a/tests/ref/history/size.json b/alacritty_terminal/tests/ref/history/size.json index b5683ff0..b5683ff0 100644 --- a/tests/ref/history/size.json +++ b/alacritty_terminal/tests/ref/history/size.json diff --git a/tests/ref/indexed_256_colors/alacritty.recording b/alacritty_terminal/tests/ref/indexed_256_colors/alacritty.recording index 6f2fb459..6f2fb459 100644 --- a/tests/ref/indexed_256_colors/alacritty.recording +++ b/alacritty_terminal/tests/ref/indexed_256_colors/alacritty.recording diff --git a/tests/ref/indexed_256_colors/grid.json b/alacritty_terminal/tests/ref/indexed_256_colors/grid.json index 5a3415e0..5a3415e0 100644 --- a/tests/ref/indexed_256_colors/grid.json +++ b/alacritty_terminal/tests/ref/indexed_256_colors/grid.json diff --git a/tests/ref/indexed_256_colors/size.json b/alacritty_terminal/tests/ref/indexed_256_colors/size.json index 3ee01660..3ee01660 100644 --- a/tests/ref/indexed_256_colors/size.json +++ b/alacritty_terminal/tests/ref/indexed_256_colors/size.json diff --git a/tests/ref/issue_855/alacritty.recording b/alacritty_terminal/tests/ref/issue_855/alacritty.recording index 6671fe04..6671fe04 100644 --- a/tests/ref/issue_855/alacritty.recording +++ b/alacritty_terminal/tests/ref/issue_855/alacritty.recording diff --git a/tests/ref/issue_855/grid.json b/alacritty_terminal/tests/ref/issue_855/grid.json index c6a94366..c6a94366 100644 --- a/tests/ref/issue_855/grid.json +++ b/alacritty_terminal/tests/ref/issue_855/grid.json diff --git a/tests/ref/issue_855/size.json b/alacritty_terminal/tests/ref/issue_855/size.json index 58507d36..58507d36 100644 --- a/tests/ref/issue_855/size.json +++ b/alacritty_terminal/tests/ref/issue_855/size.json diff --git a/tests/ref/ll/alacritty.recording b/alacritty_terminal/tests/ref/ll/alacritty.recording index 8421359c..8421359c 100644 --- a/tests/ref/ll/alacritty.recording +++ b/alacritty_terminal/tests/ref/ll/alacritty.recording diff --git a/tests/ref/ll/grid.json b/alacritty_terminal/tests/ref/ll/grid.json index 6cd7f1c2..6cd7f1c2 100644 --- a/tests/ref/ll/grid.json +++ b/alacritty_terminal/tests/ref/ll/grid.json diff --git a/tests/ref/ll/size.json b/alacritty_terminal/tests/ref/ll/size.json index 3ee01660..3ee01660 100644 --- a/tests/ref/ll/size.json +++ b/alacritty_terminal/tests/ref/ll/size.json diff --git a/tests/ref/newline_with_cursor_beyond_scroll_region/alacritty.recording b/alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/alacritty.recording index f9b23863..f9b23863 100644 --- a/tests/ref/newline_with_cursor_beyond_scroll_region/alacritty.recording +++ b/alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/alacritty.recording diff --git a/tests/ref/newline_with_cursor_beyond_scroll_region/grid.json b/alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/grid.json index 3c4d2bcb..3c4d2bcb 100644 --- a/tests/ref/newline_with_cursor_beyond_scroll_region/grid.json +++ b/alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/grid.json diff --git a/tests/ref/newline_with_cursor_beyond_scroll_region/size.json b/alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/size.json index ff20bb1e..ff20bb1e 100644 --- a/tests/ref/newline_with_cursor_beyond_scroll_region/size.json +++ b/alacritty_terminal/tests/ref/newline_with_cursor_beyond_scroll_region/size.json diff --git a/tests/ref/tab_rendering/alacritty.recording b/alacritty_terminal/tests/ref/tab_rendering/alacritty.recording index 6ad299da..6ad299da 100644 --- a/tests/ref/tab_rendering/alacritty.recording +++ b/alacritty_terminal/tests/ref/tab_rendering/alacritty.recording diff --git a/tests/ref/tab_rendering/grid.json b/alacritty_terminal/tests/ref/tab_rendering/grid.json index 94d38c59..94d38c59 100644 --- a/tests/ref/tab_rendering/grid.json +++ b/alacritty_terminal/tests/ref/tab_rendering/grid.json diff --git a/tests/ref/tab_rendering/size.json b/alacritty_terminal/tests/ref/tab_rendering/size.json index f7b43e61..f7b43e61 100644 --- a/tests/ref/tab_rendering/size.json +++ b/alacritty_terminal/tests/ref/tab_rendering/size.json diff --git a/tests/ref/tmux_git_log/alacritty.recording b/alacritty_terminal/tests/ref/tmux_git_log/alacritty.recording index 7535b35e..7535b35e 100644 --- a/tests/ref/tmux_git_log/alacritty.recording +++ b/alacritty_terminal/tests/ref/tmux_git_log/alacritty.recording diff --git a/tests/ref/tmux_git_log/grid.json b/alacritty_terminal/tests/ref/tmux_git_log/grid.json index 0a8f4647..0a8f4647 100644 --- a/tests/ref/tmux_git_log/grid.json +++ b/alacritty_terminal/tests/ref/tmux_git_log/grid.json diff --git a/tests/ref/tmux_git_log/size.json b/alacritty_terminal/tests/ref/tmux_git_log/size.json index 3ee01660..3ee01660 100644 --- a/tests/ref/tmux_git_log/size.json +++ b/alacritty_terminal/tests/ref/tmux_git_log/size.json diff --git a/tests/ref/tmux_htop/alacritty.recording b/alacritty_terminal/tests/ref/tmux_htop/alacritty.recording index 9f6b7541..9f6b7541 100644 --- a/tests/ref/tmux_htop/alacritty.recording +++ b/alacritty_terminal/tests/ref/tmux_htop/alacritty.recording diff --git a/tests/ref/tmux_htop/grid.json b/alacritty_terminal/tests/ref/tmux_htop/grid.json index 8884d42b..8884d42b 100644 --- a/tests/ref/tmux_htop/grid.json +++ b/alacritty_terminal/tests/ref/tmux_htop/grid.json diff --git a/tests/ref/tmux_htop/size.json b/alacritty_terminal/tests/ref/tmux_htop/size.json index 3ee01660..3ee01660 100644 --- a/tests/ref/tmux_htop/size.json +++ b/alacritty_terminal/tests/ref/tmux_htop/size.json diff --git a/tests/ref/vim_24bitcolors_bce/alacritty.recording b/alacritty_terminal/tests/ref/vim_24bitcolors_bce/alacritty.recording index 65ca97e1..65ca97e1 100644 --- a/tests/ref/vim_24bitcolors_bce/alacritty.recording +++ b/alacritty_terminal/tests/ref/vim_24bitcolors_bce/alacritty.recording diff --git a/tests/ref/vim_24bitcolors_bce/grid.json b/alacritty_terminal/tests/ref/vim_24bitcolors_bce/grid.json index 33110763..33110763 100644 --- a/tests/ref/vim_24bitcolors_bce/grid.json +++ b/alacritty_terminal/tests/ref/vim_24bitcolors_bce/grid.json diff --git a/tests/ref/vim_24bitcolors_bce/size.json b/alacritty_terminal/tests/ref/vim_24bitcolors_bce/size.json index e14a8c4e..e14a8c4e 100644 --- a/tests/ref/vim_24bitcolors_bce/size.json +++ b/alacritty_terminal/tests/ref/vim_24bitcolors_bce/size.json diff --git a/tests/ref/vim_large_window_scroll/alacritty.recording b/alacritty_terminal/tests/ref/vim_large_window_scroll/alacritty.recording index 2da4636f..2da4636f 100644 --- a/tests/ref/vim_large_window_scroll/alacritty.recording +++ b/alacritty_terminal/tests/ref/vim_large_window_scroll/alacritty.recording diff --git a/tests/ref/vim_large_window_scroll/grid.json b/alacritty_terminal/tests/ref/vim_large_window_scroll/grid.json index 1153e1d3..1153e1d3 100644 --- a/tests/ref/vim_large_window_scroll/grid.json +++ b/alacritty_terminal/tests/ref/vim_large_window_scroll/grid.json diff --git a/tests/ref/vim_large_window_scroll/size.json b/alacritty_terminal/tests/ref/vim_large_window_scroll/size.json index e14a8c4e..e14a8c4e 100644 --- a/tests/ref/vim_large_window_scroll/size.json +++ b/alacritty_terminal/tests/ref/vim_large_window_scroll/size.json diff --git a/tests/ref/vim_simple_edit/alacritty.recording b/alacritty_terminal/tests/ref/vim_simple_edit/alacritty.recording index 8f5c2c39..8f5c2c39 100644 --- a/tests/ref/vim_simple_edit/alacritty.recording +++ b/alacritty_terminal/tests/ref/vim_simple_edit/alacritty.recording diff --git a/tests/ref/vim_simple_edit/grid.json b/alacritty_terminal/tests/ref/vim_simple_edit/grid.json index 4f4f7b87..4f4f7b87 100644 --- a/tests/ref/vim_simple_edit/grid.json +++ b/alacritty_terminal/tests/ref/vim_simple_edit/grid.json diff --git a/tests/ref/vim_simple_edit/size.json b/alacritty_terminal/tests/ref/vim_simple_edit/size.json index eb12da0f..eb12da0f 100644 --- a/tests/ref/vim_simple_edit/size.json +++ b/alacritty_terminal/tests/ref/vim_simple_edit/size.json diff --git a/tests/ref/vttest_cursor_movement_1/alacritty.recording b/alacritty_terminal/tests/ref/vttest_cursor_movement_1/alacritty.recording index 6d51cfdf..6d51cfdf 100644 --- a/tests/ref/vttest_cursor_movement_1/alacritty.recording +++ b/alacritty_terminal/tests/ref/vttest_cursor_movement_1/alacritty.recording diff --git a/tests/ref/vttest_cursor_movement_1/grid.json b/alacritty_terminal/tests/ref/vttest_cursor_movement_1/grid.json index 8a29e67e..8a29e67e 100644 --- a/tests/ref/vttest_cursor_movement_1/grid.json +++ b/alacritty_terminal/tests/ref/vttest_cursor_movement_1/grid.json diff --git a/tests/ref/vttest_cursor_movement_1/size.json b/alacritty_terminal/tests/ref/vttest_cursor_movement_1/size.json index eb12da0f..eb12da0f 100644 --- a/tests/ref/vttest_cursor_movement_1/size.json +++ b/alacritty_terminal/tests/ref/vttest_cursor_movement_1/size.json diff --git a/tests/ref/vttest_insert/alacritty.recording b/alacritty_terminal/tests/ref/vttest_insert/alacritty.recording index 2986c82b..2986c82b 100644 --- a/tests/ref/vttest_insert/alacritty.recording +++ b/alacritty_terminal/tests/ref/vttest_insert/alacritty.recording diff --git a/tests/ref/vttest_insert/grid.json b/alacritty_terminal/tests/ref/vttest_insert/grid.json index def7c6cf..def7c6cf 100644 --- a/tests/ref/vttest_insert/grid.json +++ b/alacritty_terminal/tests/ref/vttest_insert/grid.json diff --git a/tests/ref/vttest_insert/size.json b/alacritty_terminal/tests/ref/vttest_insert/size.json index e3217b77..e3217b77 100644 --- a/tests/ref/vttest_insert/size.json +++ b/alacritty_terminal/tests/ref/vttest_insert/size.json diff --git a/tests/ref/vttest_origin_mode_1/alacritty.recording b/alacritty_terminal/tests/ref/vttest_origin_mode_1/alacritty.recording index 34060151..34060151 100644 --- a/tests/ref/vttest_origin_mode_1/alacritty.recording +++ b/alacritty_terminal/tests/ref/vttest_origin_mode_1/alacritty.recording diff --git a/tests/ref/vttest_origin_mode_1/grid.json b/alacritty_terminal/tests/ref/vttest_origin_mode_1/grid.json index c8e7d058..c8e7d058 100644 --- a/tests/ref/vttest_origin_mode_1/grid.json +++ b/alacritty_terminal/tests/ref/vttest_origin_mode_1/grid.json diff --git a/tests/ref/vttest_origin_mode_1/size.json b/alacritty_terminal/tests/ref/vttest_origin_mode_1/size.json index eb12da0f..eb12da0f 100644 --- a/tests/ref/vttest_origin_mode_1/size.json +++ b/alacritty_terminal/tests/ref/vttest_origin_mode_1/size.json diff --git a/tests/ref/vttest_origin_mode_2/alacritty.recording b/alacritty_terminal/tests/ref/vttest_origin_mode_2/alacritty.recording index 0899cece..0899cece 100644 --- a/tests/ref/vttest_origin_mode_2/alacritty.recording +++ b/alacritty_terminal/tests/ref/vttest_origin_mode_2/alacritty.recording diff --git a/tests/ref/vttest_origin_mode_2/grid.json b/alacritty_terminal/tests/ref/vttest_origin_mode_2/grid.json index af5b1ead..af5b1ead 100644 --- a/tests/ref/vttest_origin_mode_2/grid.json +++ b/alacritty_terminal/tests/ref/vttest_origin_mode_2/grid.json diff --git a/tests/ref/vttest_origin_mode_2/size.json b/alacritty_terminal/tests/ref/vttest_origin_mode_2/size.json index eb12da0f..eb12da0f 100644 --- a/tests/ref/vttest_origin_mode_2/size.json +++ b/alacritty_terminal/tests/ref/vttest_origin_mode_2/size.json diff --git a/tests/ref/vttest_scroll/alacritty.recording b/alacritty_terminal/tests/ref/vttest_scroll/alacritty.recording index a2df15a7..a2df15a7 100644 --- a/tests/ref/vttest_scroll/alacritty.recording +++ b/alacritty_terminal/tests/ref/vttest_scroll/alacritty.recording diff --git a/tests/ref/vttest_scroll/grid.json b/alacritty_terminal/tests/ref/vttest_scroll/grid.json index a8ea4e17..a8ea4e17 100644 --- a/tests/ref/vttest_scroll/grid.json +++ b/alacritty_terminal/tests/ref/vttest_scroll/grid.json diff --git a/tests/ref/vttest_scroll/size.json b/alacritty_terminal/tests/ref/vttest_scroll/size.json index eb12da0f..eb12da0f 100644 --- a/tests/ref/vttest_scroll/size.json +++ b/alacritty_terminal/tests/ref/vttest_scroll/size.json diff --git a/tests/ref/vttest_tab_clear_set/alacritty.recording b/alacritty_terminal/tests/ref/vttest_tab_clear_set/alacritty.recording index 77b22cd4..77b22cd4 100644 --- a/tests/ref/vttest_tab_clear_set/alacritty.recording +++ b/alacritty_terminal/tests/ref/vttest_tab_clear_set/alacritty.recording diff --git a/tests/ref/vttest_tab_clear_set/grid.json b/alacritty_terminal/tests/ref/vttest_tab_clear_set/grid.json index f090c4ce..f090c4ce 100644 --- a/tests/ref/vttest_tab_clear_set/grid.json +++ b/alacritty_terminal/tests/ref/vttest_tab_clear_set/grid.json diff --git a/tests/ref/vttest_tab_clear_set/size.json b/alacritty_terminal/tests/ref/vttest_tab_clear_set/size.json index 11c7c565..11c7c565 100644 --- a/tests/ref/vttest_tab_clear_set/size.json +++ b/alacritty_terminal/tests/ref/vttest_tab_clear_set/size.json diff --git a/tests/ref/zerowidth/alacritty.recording b/alacritty_terminal/tests/ref/zerowidth/alacritty.recording index 5cd029c1..5cd029c1 100644 --- a/tests/ref/zerowidth/alacritty.recording +++ b/alacritty_terminal/tests/ref/zerowidth/alacritty.recording diff --git a/tests/ref/zerowidth/config.json b/alacritty_terminal/tests/ref/zerowidth/config.json index 8be579ce..8be579ce 100644 --- a/tests/ref/zerowidth/config.json +++ b/alacritty_terminal/tests/ref/zerowidth/config.json diff --git a/tests/ref/zerowidth/grid.json b/alacritty_terminal/tests/ref/zerowidth/grid.json index 24d6395a..24d6395a 100644 --- a/tests/ref/zerowidth/grid.json +++ b/alacritty_terminal/tests/ref/zerowidth/grid.json diff --git a/tests/ref/zerowidth/size.json b/alacritty_terminal/tests/ref/zerowidth/size.json index 11c7c565..11c7c565 100644 --- a/tests/ref/zerowidth/size.json +++ b/alacritty_terminal/tests/ref/zerowidth/size.json diff --git a/tests/ref/zsh_tab_completion/alacritty.recording b/alacritty_terminal/tests/ref/zsh_tab_completion/alacritty.recording index 47b7c629..47b7c629 100644 --- a/tests/ref/zsh_tab_completion/alacritty.recording +++ b/alacritty_terminal/tests/ref/zsh_tab_completion/alacritty.recording diff --git a/tests/ref/zsh_tab_completion/grid.json b/alacritty_terminal/tests/ref/zsh_tab_completion/grid.json index 4fc02d26..4fc02d26 100644 --- a/tests/ref/zsh_tab_completion/grid.json +++ b/alacritty_terminal/tests/ref/zsh_tab_completion/grid.json diff --git a/tests/ref/zsh_tab_completion/size.json b/alacritty_terminal/tests/ref/zsh_tab_completion/size.json index 958c4a24..958c4a24 100644 --- a/tests/ref/zsh_tab_completion/size.json +++ b/alacritty_terminal/tests/ref/zsh_tab_completion/size.json diff --git a/build.rs b/build.rs deleted file mode 100644 index 9eb61afc..00000000 --- a/build.rs +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright 2016 Joe Wilm, The Alacritty Project Contributors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -#[cfg(windows)] -use embed_resource; -#[cfg(windows)] -use reqwest; -#[cfg(windows)] -use tempfile; -#[cfg(windows)] -use zip; - -use gl_generator::{Api, Fallbacks, GlobalGenerator, Profile, Registry}; - -use std::env; -use std::fs::File; -use std::path::Path; - -#[cfg(windows)] -use std::fs::OpenOptions; -#[cfg(windows)] -use std::io; - -#[cfg(windows)] -const WINPTY_PACKAGE_URL: &str = - "https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip"; - -fn main() { - let dest = env::var("OUT_DIR").unwrap(); - let mut file = File::create(&Path::new(&dest).join("gl_bindings.rs")).unwrap(); - - Registry::new(Api::Gl, (4, 5), Profile::Core, Fallbacks::All, ["GL_ARB_blend_func_extended"]) - .write_bindings(GlobalGenerator, &mut file) - .unwrap(); - - #[cfg(windows)] - { - embed_resource::compile("extra/windows/windows.rc"); - - // Path is relative to target/{profile}/build/alacritty-HASH/out - let file = Path::new(&env::var("OUT_DIR").unwrap()).join("../../../winpty-agent.exe"); - if !file.exists() { - aquire_winpty_agent(&file); - } - } -} - -#[cfg(windows)] -fn aquire_winpty_agent(out_path: &Path) { - let tmp_dir = tempfile::Builder::new().prefix("alacritty_build").tempdir().unwrap(); - - let mut response = reqwest::get(WINPTY_PACKAGE_URL).unwrap(); - let mut file = OpenOptions::new() - .read(true) - .write(true) - .create(true) - .open(tmp_dir.path().join("winpty_package.zip")) - .unwrap(); - - io::copy(&mut response, &mut file).unwrap(); - - let mut archive = zip::ZipArchive::new(file).unwrap(); - - let target = match env::var("TARGET").unwrap().split("-").next().unwrap() { - "x86_64" => "x64", - "i386" => "ia32", - _ => panic!("architecture has no winpty binary"), - }; - - let mut winpty_agent = archive.by_name(&format!("{}/bin/winpty-agent.exe", target)).unwrap(); - - io::copy(&mut winpty_agent, &mut File::create(out_path).unwrap()).unwrap(); -} diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 98fae1bc..5919e112 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -34,7 +34,7 @@ elif [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$ARCH" != "i386" ]; then # x86_64 deb docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu \ sh -c "cd /source && \ - /root/.cargo/bin/cargo deb --no-build --output ./target/deploy/${name}-ubuntu_18_04_amd64.deb" + /root/.cargo/bin/cargo deb --no-build --manifest-path alacritty/Cargo.toml --output ./target/deploy/${name}-ubuntu_18_04_amd64.deb" # Make sure all files can be uploaded without permission errors sudo chown -R $USER:$USER "./target" @@ -49,7 +49,7 @@ elif [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$ARCH" == "i386" ]; then # i386 deb docker run -v "$(pwd):/source" undeadleech/alacritty-ubuntu-i386 \ sh -c "cd /source && \ - /root/.cargo/bin/cargo deb --no-build --output ./target/deploy/${name}-ubuntu_18_04_i386.deb" + /root/.cargo/bin/cargo deb --no-build --manifest-path alacritty/Cargo.toml --output ./target/deploy/${name}-ubuntu_18_04_i386.deb" # Make sure all files can be uploaded without permission errors sudo chown -R $USER:$USER "./target" diff --git a/ci/script.sh b/ci/script.sh index 21991415..87dc872f 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -1,8 +1,5 @@ #!/bin/bash -# Check if any command failed -error=false - # Run clippy checks if [ "$CLIPPY" == "true" ]; then cargo clippy --all-targets @@ -17,25 +14,9 @@ fi # Run test in release mode if a tag is present, to produce an optimized binary if [ -n "$TRAVIS_TAG" ]; then - cargo test --release || error=true + # Build separately so we generate an 'alacritty' binary without -HASH appended + cargo build --release + cargo test --release else - cargo test || error=true -fi - -# Test the font subcrate -cargo test -p font || error=true - -# Test the winpty subcrate -if [ "$TRAVIS_OS_NAME" == "windows" ]; then - if [ -n "$TRAVIS_TAG" ]; then - mkdir -p "./target/debug/deps" - cp "./target/release/winpty-agent.exe" "./target/debug/deps" - else - cp "./target/debug/winpty-agent.exe" "./target/debug/deps" - fi - cargo test -p winpty || error=true -fi - -if [ $error == "true" ]; then - exit 1 + cargo test fi diff --git a/copypasta/src/x11.rs b/copypasta/src/x11.rs index 3bcf8455..0bb769a1 100644 --- a/copypasta/src/x11.rs +++ b/copypasta/src/x11.rs @@ -142,24 +142,3 @@ impl Clipboard { } } } - -#[cfg(test)] -mod tests { - use super::Clipboard; - use {Load, Store}; - - #[test] - fn clipboard_works() { - let mut clipboard = Clipboard::new().expect("create clipboard"); - let arst = "arst"; - let oien = "oien"; - clipboard.store_primary(arst).expect("store selection"); - clipboard.store_selection(oien).expect("store selection"); - - let selection = clipboard.load_selection().expect("load selection"); - let primary = clipboard.load_primary().expect("load selection"); - - assert_eq!(arst, primary); - assert_eq!(oien, selection); - } -} diff --git a/winpty/Cargo.toml b/winpty/Cargo.toml index 1d1529b2..a8611c3d 100644 --- a/winpty/Cargo.toml +++ b/winpty/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.0" authors = ["Zac Pullar-Strecker <zacmps@gmail.com>"] license = "MIT" description = "Safe rust bindings for winpty" +edition = "2018" [target.'cfg(windows)'.dependencies] winpty-sys = "0.4.3" @@ -13,3 +14,9 @@ widestring = "0.4.0" [target.'cfg(windows)'.dev-dependencies] named_pipe = "0.3" winapi = { version = "0.3", features = ["winnt", "processthreadsapi"] } + +[target.'cfg(windows)'.build-dependencies] +embed-resource = "1.1.4" +tempfile = "3.0.4" +reqwest = "0.9" +zip = "0.5" diff --git a/winpty/build.rs b/winpty/build.rs index a0742a11..2f4c4565 100644 --- a/winpty/build.rs +++ b/winpty/build.rs @@ -1,14 +1,67 @@ -use std::fs::copy; +#[cfg(windows)] +use std::fs::OpenOptions; +#[cfg(windows)] +use std::io; + +#[cfg(windows)] +use std::env; +#[cfg(windows)] +use std::fs::{copy, File}; +#[cfg(windows)] use std::path::Path; +#[cfg(windows)] +use embed_resource; +#[cfg(windows)] +use reqwest; +#[cfg(windows)] +use tempfile; +#[cfg(windows)] +use zip; + +#[cfg(windows)] +const WINPTY_PACKAGE_URL: &str = + "https://github.com/rprichard/winpty/releases/download/0.4.3/winpty-0.4.3-msvc2015.zip"; + fn main() { - // The working directory for `cargo test` is in the deps folder, not the debug/release root - if cfg!(test) && Path::new("target").exists() { - #[cfg(debug_assertions)] - copy("../extra/windows/x86_64/winpty-agent.exe", "target/debug/deps/winpty-agent.exe") - .unwrap(); - #[cfg(not(debug_assertions))] - copy("../extra/windows/x86_64/winpty-agent.exe", "target/release/deps/winpty-agent.exe") - .unwrap(); + #[cfg(windows)] + { + embed_resource::compile("../extra/windows/windows.rc"); + + // Path is relative to target/{profile}/build/alacritty-HASH/out + let file = Path::new(&env::var("OUT_DIR").unwrap()).join("../../../winpty-agent.exe"); + if !file.exists() { + aquire_winpty_agent(&file); + } + + // The working directory for `cargo test` is in the deps folder, not the debug/release root + copy(&file, file.parent().unwrap().join("deps/winpty-agent.exe")).unwrap(); } } + +#[cfg(windows)] +fn aquire_winpty_agent(out_path: &Path) { + let tmp_dir = tempfile::Builder::new().prefix("alacritty_build").tempdir().unwrap(); + + let mut response = reqwest::get(WINPTY_PACKAGE_URL).unwrap(); + let mut file = OpenOptions::new() + .read(true) + .write(true) + .create(true) + .open(tmp_dir.path().join("winpty_package.zip")) + .unwrap(); + + io::copy(&mut response, &mut file).unwrap(); + + let mut archive = zip::ZipArchive::new(file).unwrap(); + + let target = match env::var("TARGET").unwrap().split("-").next().unwrap() { + "x86_64" => "x64", + "i386" => "ia32", + _ => panic!("architecture has no winpty binary"), + }; + + let mut winpty_agent = archive.by_name(&format!("{}/bin/winpty-agent.exe", target)).unwrap(); + + io::copy(&mut winpty_agent, &mut File::create(out_path).unwrap()).unwrap(); +} diff --git a/winpty/src/windows.rs b/winpty/src/windows.rs index 064db2da..5746df2a 100644 --- a/winpty/src/windows.rs +++ b/winpty/src/windows.rs @@ -337,10 +337,9 @@ impl<'a> Drop for SpawnConfig<'a> { #[cfg(test)] mod tests { - extern crate named_pipe; - extern crate winapi; + use named_pipe::PipeClient; + use winapi; - use self::named_pipe::PipeClient; use self::winapi::um::processthreadsapi::OpenProcess; use self::winapi::um::winnt::READ_CONTROL; |