diff options
| author | Joe Wilm <jwilm@users.noreply.github.com> | 2018-12-10 09:53:56 -0800 |
|---|---|---|
| committer | Christian Duerr <chrisduerr@users.noreply.github.com> | 2018-12-10 17:53:56 +0000 |
| commit | 217ad9ec285b4923de1790b0976c8c793039c994 (patch) | |
| tree | 440e0d6d35f119246d2b113fd01b431f4f9c2c38 /src/tty/mod.rs | |
| parent | 7ab0b448479c9705fa14003bda97040630710b7a (diff) | |
| download | r-alacritty-217ad9ec285b4923de1790b0976c8c793039c994.tar.gz r-alacritty-217ad9ec285b4923de1790b0976c8c793039c994.tar.bz2 r-alacritty-217ad9ec285b4923de1790b0976c8c793039c994.zip | |
Upgrade to Rust 2018
This resolves a lot of NLL issues, however full NLL will be necessary to
handle a couple of remaining issues.
Diffstat (limited to 'src/tty/mod.rs')
| -rw-r--r-- | src/tty/mod.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tty/mod.rs b/src/tty/mod.rs index faed276d..cedb010e 100644 --- a/src/tty/mod.rs +++ b/src/tty/mod.rs @@ -18,7 +18,7 @@ use std::{env, io}; use terminfo::Database; -use config::Config; +use crate::config::Config; #[cfg(not(windows))] mod unix; @@ -39,13 +39,13 @@ pub trait EventedReadWrite { fn register( &mut self, - &mio::Poll, - &mut Iterator<Item = &usize>, - mio::Ready, - mio::PollOpt, + _: &mio::Poll, + _: &mut dyn Iterator<Item = &usize>, + _: mio::Ready, + _: mio::PollOpt, ) -> io::Result<()>; - fn reregister(&mut self, &mio::Poll, mio::Ready, mio::PollOpt) -> io::Result<()>; - fn deregister(&mut self, &mio::Poll) -> io::Result<()>; + fn reregister(&mut self, _: &mio::Poll, _: mio::Ready, _: mio::PollOpt) -> io::Result<()>; + fn deregister(&mut self, _: &mio::Poll) -> io::Result<()>; fn reader(&mut self) -> &mut Self::Reader; fn read_token(&self) -> mio::Token; |