From efe071d998df3adb8f394b93d8cc0274c953706f Mon Sep 17 00:00:00 2001 From: Imbris Date: Sat, 6 Jun 2020 15:58:16 -0400 Subject: [PATCH] Fix panic with multibyte whitespace characters --- Cargo.lock | 6 +++--- voxygen/Cargo.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 197e07a52e..d5eec15a88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -637,7 +637,7 @@ dependencies = [ [[package]] name = "conrod_core" version = "0.63.0" -source = "git+https://gitlab.com/veloren/conrod.git?branch=capucho/hide_text_cursor_fix#df3a5d8098687fb0addf6fdf7c9ad2ac8794997f" +source = "git+https://gitlab.com/veloren/conrod.git?branch=pre-winit-20#46b374edc9537300e5278905ebd14dff45cfd927" dependencies = [ "conrod_derive", "copypasta", @@ -652,7 +652,7 @@ dependencies = [ [[package]] name = "conrod_derive" version = "0.63.0" -source = "git+https://gitlab.com/veloren/conrod.git?branch=capucho/hide_text_cursor_fix#df3a5d8098687fb0addf6fdf7c9ad2ac8794997f" +source = "git+https://gitlab.com/veloren/conrod.git?branch=pre-winit-20#46b374edc9537300e5278905ebd14dff45cfd927" dependencies = [ "proc-macro2 0.4.30", "quote 0.6.13", @@ -662,7 +662,7 @@ dependencies = [ [[package]] name = "conrod_winit" version = "0.63.0" -source = "git+https://gitlab.com/veloren/conrod.git?branch=capucho/hide_text_cursor_fix#df3a5d8098687fb0addf6fdf7c9ad2ac8794997f" +source = "git+https://gitlab.com/veloren/conrod.git?branch=pre-winit-20#46b374edc9537300e5278905ebd14dff45cfd927" [[package]] name = "const-random" diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index cc4d84312f..cc44fe8c11 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -25,8 +25,8 @@ gfx_device_gl = { version = "0.16.2", optional = true } gfx_window_glutin = "0.31.0" glutin = "0.21.1" winit = { version = "0.19.4", features = ["serde"] } -conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "capucho/hide_text_cursor_fix" } -conrod_winit = { git = "https://gitlab.com/veloren/conrod.git", branch = "capucho/hide_text_cursor_fix" } +conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "pre-winit-20" } +conrod_winit = { git = "https://gitlab.com/veloren/conrod.git", branch = "pre-winit-20" } euc = "0.3.0" # ECS