diff --git a/Cargo.toml b/Cargo.toml index 64328282939ef3a92c9533b4e0f7df696687f585..25ef0908d1738e4bcc8629131dc4b3623c63632a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ name = "ion" path = "src/main.rs" [build-dependencies] -ansi_term = "0.10" +ansi_term = "0.11" version_check = "0.1.3" [dependencies] @@ -35,7 +35,7 @@ itoa = "0.4" lazy_static = "1.0" liner = { git = "https://github.com/redox-os/liner" } permutate = "0.3" -rand = "0.4" +rand = "0.5" regex = "1.0" smallstring = "0.1" smallvec = "0.6" @@ -52,7 +52,7 @@ panic = "abort" [target."cfg(all(unix, not(target_os = \"redox\")))".dependencies] libc = "0.2" libloading = "0.5" -users = "0.6" +users = "0.7" [target."cfg(target_os = \"redox\")".dependencies] redox_syscall = "0.1" diff --git a/src/lib/shell/binary/readln.rs b/src/lib/shell/binary/readln.rs index e46e70182695e7629875a72677562aba452f0276..1458a74e952516825e0ed6e85421967285f22d41 100644 --- a/src/lib/shell/binary/readln.rs +++ b/src/lib/shell/binary/readln.rs @@ -27,6 +27,7 @@ pub(crate) fn readln(shell: &mut Shell) -> Option<String> { let line = shell.context.as_mut().unwrap().read_line( prompt, + None, &mut move |Event { editor, kind }| { if let EventKind::BeforeComplete = kind { let (words, pos) = editor.get_words_and_cursor_position(); diff --git a/src/lib/shell/variables/mod.rs b/src/lib/shell/variables/mod.rs index 7425360b390595f26b81fb7a97639d77f2e188e8..dfb5d4273a609954c1f43f703706e10a45219f1f 100644 --- a/src/lib/shell/variables/mod.rs +++ b/src/lib/shell/variables/mod.rs @@ -356,7 +356,7 @@ impl Variables { if sys::isatty(sys::STDIN_FILENO) { let mut con = Context::new(); for arg in args.into_iter().skip(1) { - match con.read_line(format!("{}=", arg.as_ref().trim()), &mut |_| {}) { + match con.read_line(format!("{}=", arg.as_ref().trim()), None, &mut |_| {}) { Ok(buffer) => self.set_var(arg.as_ref(), buffer.trim()), Err(_) => return FAILURE, }