Merge branch 'master' into 'master'

Update dependencies

See merge request !198

Cargo.toml

@@ -15,7 +15,7 @@ keywords = ["tty", "color", "terminal", "password", "tui"]
 exclude = ["target", "CHANGELOG.md", "image.png", "Cargo.lock"]
 
 [dependencies]
-numtoa = { version = "0.1", features = ["std"]}
+numtoa = { version = "0.2.4"}
 serde = { version = "1.0", features = ["derive"], optional = true }
 
 [target.'cfg(not(target_os = "redox"))'.dependencies]
@@ -23,4 +23,4 @@ libc = "0.2"
 
 [target.'cfg(target_os = "redox")'.dependencies]
 redox_termios = "0.1.3"
-libredox = "0.0.2"
+libredox = "0.1.3"

src/sys/redox/attr.rs

@@ -2,7 +2,7 @@ use std::convert::TryInto;
 use std::io;
 use std::os::fd::{AsRawFd, BorrowedFd};
 
-use super::{cvt, Termios};
+use super::Termios;
 
 pub fn get_terminal_attr(fd: BorrowedFd) -> io::Result<Termios> {
     let mut termios = Termios::default();
@@ -11,8 +11,8 @@ pub fn get_terminal_attr(fd: BorrowedFd) -> io::Result<Termios> {
         .as_raw_fd()
         .try_into()
         .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
-    let fd = cvt(libredox::call::dup(fd, b"termios"))?;
-    let res = cvt(libredox::call::read(fd, &mut termios));
+    let fd = libredox::call::dup(fd, b"termios")?;
+    let res = libredox::call::read(fd, &mut termios);
     let _ = libredox::call::close(fd);
 
     if res? == termios.len() {
@@ -30,8 +30,8 @@ pub fn set_terminal_attr(fd: BorrowedFd, termios: &Termios) -> io::Result<()> {
         .as_raw_fd()
         .try_into()
         .map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
-    let fd = cvt(libredox::call::dup(fd, b"termios"))?;
-    let res = cvt(libredox::call::write(fd, termios));
+    let fd = libredox::call::dup(fd, b"termios")?;
+    let res = libredox::call::write(fd, termios);
     let _ = libredox::call::close(fd);
 
     if res? == termios.len() {

src/sys/redox/mod.rs

 extern crate libredox;
 extern crate redox_termios;
 
-use std::io;
-
 pub use self::redox_termios::Termios;
 
 pub mod attr;
 pub mod size;
 pub mod tty;
-
-// Support function for converting syscall error to io error
-fn cvt(result: Result<usize, libredox::error::Error>) -> io::Result<usize> {
-    result.map_err(|err| io::Error::from_raw_os_error(err.errno))
-}

src/sys/redox/size.rs

 use std::io;
 
-use super::{cvt, redox_termios};
+use super::redox_termios;
 
 /// Get the size of the terminal.
 pub fn terminal_size() -> io::Result<(u16, u16)> {
     let mut winsize = redox_termios::Winsize::default();
 
-    let fd = cvt(libredox::call::dup(1, b"winsize"))?;
-    let res = cvt(libredox::call::read(fd, &mut winsize));
+    let fd = libredox::call::dup(1, b"winsize")?;
+    let res = libredox::call::read(fd, &mut winsize);
     let _ = libredox::call::close(fd);
 
     if res? == winsize.len() {