From 56fea343ff94b23aa94f8756643c015f20517e8f Mon Sep 17 00:00:00 2001
From: Christian Duerr <chrisduerr@users.noreply.github.com>
Date: Tue, 9 Apr 2019 19:29:46 +0000
Subject: Set maximum Rust version to 1.31.0

By setting the minimum Rust version and enforcing it with CI, Alacritty
should hopefully make it possible for maintainers to package the
application even on distributions which are not rolling release.

The 1.31.0 target has been chosen here because it's the first version of
the Rust 2018 release. Bumping this version in the future should be
considered to be a breaking change and should only be done with caution
and in consideration of the supported Rust versions of the major
distributions available.

This fixes #2277.
---
 src/cli.rs    | 2 +-
 src/window.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/cli.rs b/src/cli.rs
index 6089ac2d..db108053 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -11,8 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+use ::log;
 use clap::{crate_authors, crate_description, crate_name, crate_version, App, Arg};
-use log;
 
 use crate::config::{Delta, Dimensions, Shell};
 use crate::index::{Column, Line};
diff --git a/src/window.rs b/src/window.rs
index 03b04e41..224eb7c3 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -21,7 +21,7 @@ use glutin::os::unix::EventsLoopExt;
 #[cfg(windows)]
 use glutin::Icon;
 use glutin::{
-    self, ContextBuilder, ControlFlow, Event, EventsLoop, MouseCursor, PossiblyCurrentContext,
+    self, ContextBuilder, ControlFlow, Event, EventsLoop, MouseCursor, PossiblyCurrent,
     WindowBuilder,
 };
 #[cfg(windows)]
@@ -54,7 +54,7 @@ type Result<T> = ::std::result::Result<T, Error>;
 /// Wraps the underlying windowing library to provide a stable API in Alacritty
 pub struct Window {
     event_loop: EventsLoop,
-    windowed_context: glutin::WindowedContext<PossiblyCurrentContext>,
+    windowed_context: glutin::WindowedContext<PossiblyCurrent>,
     mouse_visible: bool,
 
     /// Whether or not the window is the focused window.
@@ -119,7 +119,7 @@ fn create_gl_window(
     window: WindowBuilder,
     event_loop: &EventsLoop,
     srgb: bool,
-) -> Result<glutin::WindowedContext<PossiblyCurrentContext>> {
+) -> Result<glutin::WindowedContext<PossiblyCurrent>> {
     let windowed_context = ContextBuilder::new()
         .with_srgb(srgb)
         .with_vsync(true)
-- 
cgit