diff --git a/Cargo.lock b/Cargo.lock index cfd4127..36d407a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,28 +2,27 @@ name = "neovim-gtk" version = "0.1.0" dependencies = [ - "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "neovim-lib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "phf 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_codegen 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "neovim-lib 0.2.0 (git+https://github.com/daa84/neovim-lib?branch=rmp-update)", + "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "atk-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -38,7 +37,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "0.3.13" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -48,179 +47,179 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cairo-rs" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c_vec 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cairo-sys-rs" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk-pixbuf" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gdk-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pango-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gio" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gio-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glib" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glib-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gobject-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gtk" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-rs 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gtk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pango 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-rs 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gio 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gtk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pango 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "gtk-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "atk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "atk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cairo-sys-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-pixbuf-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gdk-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gio-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cairo-sys-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-pixbuf-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gdk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gio-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pango-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.12" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -230,100 +229,131 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "neovim-lib" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.2.0" +source = "git+https://github.com/daa84/neovim-lib?branch=rmp-update#75675a2fef02a30cea119700d36f49270e77b7b3" dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rmp-serialize 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", + "rmp 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "num-traits" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "pango" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "glib 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pango-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pango-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "pango-sys" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glib-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gobject-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf" -version = "0.7.15" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_codegen" -version = "0.7.15" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_generator 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_generator" -version = "0.7.15" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "phf_shared 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", + "phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "phf_shared" -version = "0.7.15" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "siphasher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "pkg-config" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rand" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rmp" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "rmp-serialize" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rmp 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rustc-serialize" -version = "0.3.19" +name = "siphasher" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +[metadata] +"checksum atk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3dd4937c8c40a0b5184d7810772d44cd3d4afdca711b8878c7f14b3f8ef80f" +"checksum bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dead7461c1127cf637931a1e50934eb6eee8bff2f74433ac7909e9afcee04a3" +"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23" +"checksum byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c40977b0ee6b9885c9013cd41d9feffdd22deb3bb4dc3a71d901cc7a77de18c8" +"checksum c_vec 1.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "aa9e1d9f7d49e289f36f19effbf3d5a5e30163ecf9c7a3c9be94d5374dec5b9a" +"checksum cairo-rs 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3e2dae876fba33394353e985bff24e011a18250cf0021d07b86900b77388b0" +"checksum cairo-sys-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e377d5ccba12485dbdd1d459d711b948bbbed867f5808b25e0e2f6c8a45935f6" +"checksum gdk 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "151196bd3a35bc157b7dca6ee98bb701dca59439dedd19d8a85b2d8759e0afaf" +"checksum gdk-pixbuf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f893bde751ef13bae431c5643021d0b9365b5455ab6b2febbc492bbe431d573b" +"checksum gdk-pixbuf-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f04793815a1e18b12de3b5bf41820c64ff84323510ecf3261a7f329eccd59500" +"checksum gdk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0f372ea49640676521a6591a6d49987f442095a862799429fc129b1fdcf91716" +"checksum gio 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "734791445c09c47176d456457da457703e5297ce93ae088924fed7cb98b49663" +"checksum gio-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0b0e02a42941ed54bf56ac179693469a37abe118d9ce710669d8c1b6391c79" +"checksum glib 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a4beb06ab666c546a921d93e6550e5ceb3fa7a8f9450920792144543489c1bb1" +"checksum glib-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a315f2df997f0ca1e3ebf1a78b5c6e455a7d75b8da8891ddf77068bf3d7492b3" +"checksum gobject-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88376c229e515b770f6ae56c5460a52cbc24ba4e81fd9a4c0a65900335241e8f" +"checksum gtk 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "50c5d2d3330a4d92348bbe5e2346fbeb31384af1d547c0ad7c120639d8c19718" +"checksum gtk-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecdca043a321a1c19a16ae0efb9fcab6922051711fe238413b80f301e9caf17d" +"checksum libc 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "684f330624d8c3784fb9558ca46c4ce488073a8d22450415c5eb4f4cfb0d11b5" +"checksum log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ab83497bf8bf4ed2a74259c1c802351fcd67a65baa86394b6ba73c36f4838054" +"checksum neovim-lib 0.2.0 (git+https://github.com/daa84/neovim-lib?branch=rmp-update)" = "" +"checksum num-traits 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a16a42856a256b39c6d3484f097f6713e14feacd9bfb02290917904fae46c81c" +"checksum pango 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d25afdf2915e8afee5d0c2fccd8426b7c32e3a58aaf7ed2b41a4609c64617de" +"checksum pango-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a894abf6d9c35d205137cecc9e06e500b145f8381a4a700b2036aaa4fe8b6874" +"checksum phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "cb325642290f28ee14d8c6201159949a872f220c62af6e110a56ea914fbe42fc" +"checksum phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d62594c0bb54c464f633175d502038177e90309daf2e0158be42ed5f023ce88f" +"checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03" +"checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2" +"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" +"checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d" +"checksum rmp 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a930e81dd6ccc8f8c9cbcd7a622ee4b2aef614781be9b75feaeeea1efbbd96e" +"checksum siphasher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ffc669b726f2bc9a3bcff66e5e23b56ba6bf70e22a34c3d7b6d0b3450b65b84" diff --git a/Cargo.toml b/Cargo.toml index d7409be..44cd89d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,10 +10,13 @@ glib = "0.1" glib-sys = "0.3" gdk = "0.5" gdk-sys = "0.3" -neovim-lib = "^0.1.1" -rmp = "0.7" +#neovim-lib = "^0.1.1" phf = "0.7" +[dependencies.neovim-lib] +git = "https://github.com/daa84/neovim-lib" +branch = "rmp-update" + [build-dependencies] phf_codegen = "0.7" diff --git a/src/input.rs b/src/input.rs index 23ed439..ce53a8c 100644 --- a/src/input.rs +++ b/src/input.rs @@ -7,7 +7,8 @@ include!(concat!(env!("OUT_DIR"), "/key_map_table.rs")); pub fn keyval_to_input_string(val: &str, state: gdk::ModifierType) -> String { - let mut input = String::from("<"); + let mut input = String::new(); + if state.contains(gdk::SHIFT_MASK) { input.push_str("S-"); } @@ -17,9 +18,14 @@ pub fn keyval_to_input_string(val: &str, state: gdk::ModifierType) -> String { if state.contains(gdk::MOD1_MASK) { input.push_str("A-"); } + input.push_str(val); - input.push_str(">"); - input + + if input.len() > 1 { + format!("<{}>", input) + } else { + input + } } pub fn convert_key(ev: &EventKey) -> Option { diff --git a/src/main.rs b/src/main.rs index 9bf0351..73dc9f8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,6 @@ extern crate glib; extern crate glib_sys; extern crate cairo; extern crate neovim_lib; -extern crate rmp; extern crate phf; mod nvim; diff --git a/src/nvim.rs b/src/nvim.rs index 0a0ac8b..3fb0c8b 100644 --- a/src/nvim.rs +++ b/src/nvim.rs @@ -1,10 +1,8 @@ -use neovim_lib::{Neovim, NeovimApi, Session}; +use neovim_lib::{Neovim, NeovimApi, Session, Value, Integer}; use std::io::{Result, Error, ErrorKind}; use std::result; use std::collections::HashMap; use ui_model::UiModel; -use rmp::Value; -use rmp::value::Integer; use ui; use ui::Ui; use glib; diff --git a/src/ui.rs b/src/ui.rs index 1c8c39b..0abef23 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -3,9 +3,6 @@ use std::thread; use std::collections::HashMap; use std::string::String; -use rmp::Value; -use rmp::value::Integer; - use cairo; use cairo::TextExtents; use cairo::enums::{FontWeight, FontSlant}; @@ -16,7 +13,7 @@ use gdk::{ModifierType, Event, EventKey, EventConfigure, EventButton, EventMotio use gdk_sys; use glib; use glib_sys; -use neovim_lib::{Neovim, NeovimApi}; +use neovim_lib::{Neovim, NeovimApi, Value, Integer}; use ui_model::{UiModel, Attrs, Color, COLOR_BLACK, COLOR_WHITE}; use nvim::RedrawEvents; @@ -32,7 +29,7 @@ const FONT_SIZE: f64 = 16.0; thread_local!(pub static UI: RefCell = { let thread = thread::current(); let current_thread_name = thread.name(); - if current_thread_name != Some("
") { + if current_thread_name != Some("main") { panic!("Can create UI only from main thread, {:?}", current_thread_name); } RefCell::new(Ui::new())