Commit c27678ef authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'bubble-read-errors' into 'master'

Make the keys return their inner error, if any.

See merge request redox-os/termion!162
parents 11fbe715 e81a1c4c
......@@ -19,7 +19,7 @@ impl<R: Read> Iterator for Keys<R> {
match {
Some(Ok(Event::Key(k))) => return Some(Ok(k)),
Some(Ok(_)) => continue,
e @ Some(Err(_)) => e,
Some(Err(e)) => return Some(Err(e)),
None => return None,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment