alacritty

fork of https://github.com/jwilm/alacritty, experimental
git clone git://git.thc420.xyz/alacritty
Log | Files | Refs | README

commit f59aa19892724f41e3a56817fb69e95413312920
parent 55d346c7d44215c51187cafcac79e3504209f942
Author: Matthias Kr├╝ger <matthias.krueger@famsik.de>
Date:   Sun,  9 Jun 2019 19:52:48 +0200

Fix compiler warnings


Diffstat:
Malacritty_terminal/src/clipboard.rs | 4++--
Malacritty_terminal/src/tty/unix.rs | 2++
Malacritty_terminal/src/url.rs | 2+-
Malacritty_terminal/src/util.rs | 2++
Mfont/src/ft/mod.rs | 2+-
5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/alacritty_terminal/src/clipboard.rs b/alacritty_terminal/src/clipboard.rs @@ -26,8 +26,8 @@ use copypasta::x11_clipboard::{Primary as X11SelectionClipboard, X11ClipboardCon use copypasta::{ClipboardContext, ClipboardProvider}; pub struct Clipboard { - clipboard: Box<ClipboardProvider>, - selection: Option<Box<ClipboardProvider>>, + clipboard: Box<dyn ClipboardProvider>, + selection: Option<Box<dyn ClipboardProvider>>, } impl Clipboard { diff --git a/alacritty_terminal/src/tty/unix.rs b/alacritty_terminal/src/tty/unix.rs @@ -194,6 +194,8 @@ pub fn new<T: ToWinsize>(config: &Config, size: &T, window_id: Option<usize>) -> builder.env("WINDOWID", format!("{}", window_id)); } + // TODO: Rust 1.34.0 + #[allow(deprecated)] builder.before_exec(move || { // Create a new process group unsafe { diff --git a/alacritty_terminal/src/url.rs b/alacritty_terminal/src/url.rs @@ -73,7 +73,7 @@ impl UrlParser { self.state.char_indices().rev().skip_while(|(byte_index, _)| *byte_index >= index); for (byte_index, c) in iter { match c { - 'a'...'z' | 'A'...'Z' => (), + 'a'..='z' | 'A'..='Z' => (), _ => { self.origin = self.origin.saturating_sub(byte_index + c.width().unwrap_or(1)); diff --git a/alacritty_terminal/src/util.rs b/alacritty_terminal/src/util.rs @@ -87,6 +87,8 @@ where I: IntoIterator<Item = S>, S: AsRef<OsStr>, { + // TODO: Rust 1.34.0 + #[allow(deprecated)] Command::new(program) .args(args) .stdin(Stdio::null()) diff --git a/font/src/ft/mod.rs b/font/src/ft/mod.rs @@ -539,7 +539,7 @@ pub enum Error { } impl ::std::error::Error for Error { - fn cause(&self) -> Option<&::std::error::Error> { + fn cause(&self) -> Option<&dyn (::std::error::Error)> { match *self { Error::FreeType(ref err) => Some(err), _ => None,