aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cli.rs2
-rw-r--r--src/window.rs6
2 files changed, 4 insertions, 4 deletions
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)