From 71bd64a6bf8abb260f0d42abeb1a0f32f59f044c Mon Sep 17 00:00:00 2001 From: Victor Brekenfeld Date: Sat, 15 Dec 2018 21:32:28 +0100 Subject: [PATCH] Fix source code for 2018 edition --- Cargo.toml | 1 + anvil/Cargo.toml | 1 + anvil/src/glium_drawer.rs | 8 ++++---- anvil/src/input_handler.rs | 2 +- anvil/src/shaders.rs | 12 ++++++------ anvil/src/shell.rs | 4 ++-- anvil/src/shm_load.rs | 8 ++++---- anvil/src/udev.rs | 6 +++--- anvil/src/winit.rs | 6 +++--- src/backend/drm/egl/error.rs | 2 +- src/backend/drm/egl/mod.rs | 12 ++++++------ src/backend/drm/egl/session.rs | 6 +++--- src/backend/drm/egl/surface.rs | 12 ++++++------ src/backend/drm/gbm/egl.rs | 10 +++++----- src/backend/drm/gbm/error.rs | 2 +- src/backend/drm/gbm/mod.rs | 2 +- src/backend/drm/gbm/session.rs | 4 ++-- src/backend/drm/gbm/surface.rs | 6 +++--- src/backend/drm/legacy/error.rs | 2 +- src/backend/drm/legacy/mod.rs | 2 +- src/backend/drm/legacy/session.rs | 2 +- src/backend/drm/legacy/surface.rs | 6 +++--- src/backend/egl/context.rs | 4 ++-- src/backend/egl/mod.rs | 2 +- src/backend/egl/native.rs | 2 +- src/backend/egl/surface.rs | 2 +- src/backend/graphics/glium.rs | 2 +- src/backend/libinput.rs | 8 ++++---- src/backend/session/auto.rs | 4 ++-- src/backend/session/dbus/logind.rs | 4 ++-- src/backend/session/direct.rs | 2 +- src/backend/udev.rs | 2 +- src/backend/winit.rs | 6 +++--- src/wayland/compositor/mod.rs | 4 ++-- src/wayland/data_device/dnd_grab.rs | 2 +- src/wayland/data_device/mod.rs | 4 ++-- src/wayland/data_device/server_dnd_grab.rs | 2 +- src/wayland/output/mod.rs | 2 +- src/wayland/seat/keyboard.rs | 2 +- src/wayland/seat/mod.rs | 4 ++-- src/wayland/seat/pointer.rs | 2 +- src/wayland/shell/legacy/mod.rs | 4 ++-- src/wayland/shell/legacy/wl_handlers.rs | 2 +- src/wayland/shell/xdg/mod.rs | 6 +++--- src/wayland/shell/xdg/xdg_handlers.rs | 4 ++-- src/wayland/shell/xdg/zxdgv6_handlers.rs | 4 ++-- src/wayland/shm/mod.rs | 2 +- src/xwayland/xserver.rs | 2 +- 48 files changed, 101 insertions(+), 99 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 433ede9..e8392ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,7 @@ authors = ["Victor Berger ", "Drakulix (Victor Brekenfeld license = "MIT" description = "Smithay is a library for writing wayland compositors." repository = "https://github.com/Smithay/smithay" +edition = "2018" [workspace] members = [ "anvil" ] diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml index 90565a4..fb02964 100644 --- a/anvil/Cargo.toml +++ b/anvil/Cargo.toml @@ -4,6 +4,7 @@ version = "0.0.1" authors = ["Victor Berger ", "Drakulix (Victor Brekenfeld)"] license = "MIT" publish = false +edition = "2018" [dependencies] slog = { version = "2.1.1" } diff --git a/anvil/src/glium_drawer.rs b/anvil/src/glium_drawer.rs index bb42aa3..4a6ce9f 100644 --- a/anvil/src/glium_drawer.rs +++ b/anvil/src/glium_drawer.rs @@ -30,8 +30,8 @@ use smithay::{ }, }; -use shaders; -use shell::{MyCompositorToken, MyWindowMap}; +use crate::shaders; +use crate::shell::{MyCompositorToken, MyWindowMap}; #[derive(Copy, Clone)] struct Vertex { @@ -181,7 +181,7 @@ impl GliumDrawer { } Ok(TextureMetadata { texture: opengl_texture, - fragment: ::shaders::BUFFER_RGBA, + fragment: crate::shaders::BUFFER_RGBA, y_inverted: images.y_inverted, dimensions: (images.width, images.height), images: Some(images), // I guess we need to keep this alive ? @@ -205,7 +205,7 @@ impl GliumDrawer { fn texture_from_shm_buffer(&self, buffer: Resource) -> Result { match shm_buffer_contents(&buffer, |slice, data| { - ::shm_load::load_shm_buffer(data, slice) + crate::shm_load::load_shm_buffer(data, slice) .map(|(image, kind)| (Texture2d::new(&self.display, image).unwrap(), kind, data)) }) { Ok(Ok((texture, kind, data))) => Ok(TextureMetadata { diff --git a/anvil/src/input_handler.rs b/anvil/src/input_handler.rs index cdb397f..baf66d7 100644 --- a/anvil/src/input_handler.rs +++ b/anvil/src/input_handler.rs @@ -24,7 +24,7 @@ use smithay::{ wayland_server::protocol::wl_pointer, }; -use shell::MyWindowMap; +use crate::shell::MyWindowMap; pub struct AnvilInputHandler { log: Logger, diff --git a/anvil/src/shaders.rs b/anvil/src/shaders.rs index 67685e1..3e6e4c2 100644 --- a/anvil/src/shaders.rs +++ b/anvil/src/shaders.rs @@ -12,7 +12,7 @@ macro_rules! make_program( ($display: expr, $fragment_shader:expr) => { program!($display, 100 => { - vertex: ::shaders::VERTEX_SHADER, + vertex: crate::shaders::VERTEX_SHADER, fragment: $fragment_shader, }, ).unwrap() @@ -23,11 +23,11 @@ macro_rules! make_program( macro_rules! opengl_programs( ($display: expr) => { [ - make_program!($display, ::shaders::FRAGMENT_SHADER_RGBA), - make_program!($display, ::shaders::FRAGMENT_SHADER_ABGR), - make_program!($display, ::shaders::FRAGMENT_SHADER_XBGR), - make_program!($display, ::shaders::FRAGMENT_SHADER_BGRA), - make_program!($display, ::shaders::FRAGMENT_SHADER_BGRX), + make_program!($display, crate::shaders::FRAGMENT_SHADER_RGBA), + make_program!($display, crate::shaders::FRAGMENT_SHADER_ABGR), + make_program!($display, crate::shaders::FRAGMENT_SHADER_XBGR), + make_program!($display, crate::shaders::FRAGMENT_SHADER_BGRA), + make_program!($display, crate::shaders::FRAGMENT_SHADER_BGRX), ] } ); diff --git a/anvil/src/shell.rs b/anvil/src/shell.rs index 3ec7c5f..c0b8d27 100644 --- a/anvil/src/shell.rs +++ b/anvil/src/shell.rs @@ -27,7 +27,7 @@ use smithay::{ }, }; -use window_map::{Kind as SurfaceKind, WindowMap}; +use crate::window_map::{Kind as SurfaceKind, WindowMap}; define_roles!(Roles => [ XdgSurface, XdgSurfaceRole ] @@ -132,7 +132,7 @@ pub fn init_shell( #[derive(Default)] pub struct SurfaceData { pub buffer: Option>, - pub texture: Option<::glium_drawer::TextureMetadata>, + pub texture: Option, } fn surface_commit(surface: &Resource, token: CompositorToken) { diff --git a/anvil/src/shm_load.rs b/anvil/src/shm_load.rs index 7bdf403..fdb2483 100644 --- a/anvil/src/shm_load.rs +++ b/anvil/src/shm_load.rs @@ -33,10 +33,10 @@ pub fn load_shm_buffer(data: BufferData, pool: &[u8]) -> Result<(RawImage2d, // sharders format need to be reversed to account for endianness let (client_format, fragment) = match data.format { - Format::Argb8888 => (ClientFormat::U8U8U8U8, ::shaders::BUFFER_BGRA), - Format::Xrgb8888 => (ClientFormat::U8U8U8U8, ::shaders::BUFFER_BGRX), - Format::Rgba8888 => (ClientFormat::U8U8U8U8, ::shaders::BUFFER_ABGR), - Format::Rgbx8888 => (ClientFormat::U8U8U8U8, ::shaders::BUFFER_XBGR), + Format::Argb8888 => (ClientFormat::U8U8U8U8, crate::shaders::BUFFER_BGRA), + Format::Xrgb8888 => (ClientFormat::U8U8U8U8, crate::shaders::BUFFER_BGRX), + Format::Rgba8888 => (ClientFormat::U8U8U8U8, crate::shaders::BUFFER_ABGR), + Format::Rgbx8888 => (ClientFormat::U8U8U8U8, crate::shaders::BUFFER_XBGR), _ => return Err(data.format), }; Ok(( diff --git a/anvil/src/udev.rs b/anvil/src/udev.rs index 4224baa..c7ea8b0 100644 --- a/anvil/src/udev.rs +++ b/anvil/src/udev.rs @@ -61,9 +61,9 @@ use smithay::{ }, }; -use glium_drawer::GliumDrawer; -use input_handler::AnvilInputHandler; -use shell::{init_shell, MyWindowMap, Roles, SurfaceData}; +use crate::glium_drawer::GliumDrawer; +use crate::input_handler::AnvilInputHandler; +use crate::shell::{init_shell, MyWindowMap, Roles, SurfaceData}; pub struct SessionFd(RawFd); impl AsRawFd for SessionFd { diff --git a/anvil/src/winit.rs b/anvil/src/winit.rs index 6d9e511..6da43b4 100644 --- a/anvil/src/winit.rs +++ b/anvil/src/winit.rs @@ -17,9 +17,9 @@ use smithay::{ use slog::Logger; -use glium_drawer::GliumDrawer; -use input_handler::AnvilInputHandler; -use shell::init_shell; +use crate::glium_drawer::GliumDrawer; +use crate::input_handler::AnvilInputHandler; +use crate::shell::init_shell; pub fn run_winit(display: &mut Display, event_loop: &mut EventLoop<()>, log: Logger) -> Result<(), ()> { let (renderer, mut input) = winit::init(log.clone()).map_err(|_| ())?; diff --git a/src/backend/drm/egl/error.rs b/src/backend/drm/egl/error.rs index f55ccff..66fd2d1 100644 --- a/src/backend/drm/egl/error.rs +++ b/src/backend/drm/egl/error.rs @@ -3,7 +3,7 @@ //! and [`EglSurface`](::backend::drm::egl::EglSurface). //! -use backend::egl::error as egl; +use crate::backend::egl::error as egl; error_chain! { errors { diff --git a/src/backend/drm/egl/mod.rs b/src/backend/drm/egl/mod.rs index fec2968..cc962da 100644 --- a/src/backend/drm/egl/mod.rs +++ b/src/backend/drm/egl/mod.rs @@ -15,12 +15,12 @@ use std::rc::Rc; use wayland_server::Display; use super::{Device, DeviceHandler, Surface}; -use backend::egl::context::GlAttributes; -use backend::egl::error::Result as EGLResult; -use backend::egl::native::{Backend, NativeDisplay, NativeSurface}; -use backend::egl::EGLContext; +use crate::backend::egl::context::GlAttributes; +use crate::backend::egl::error::Result as EGLResult; +use crate::backend::egl::native::{Backend, NativeDisplay, NativeSurface}; +use crate::backend::egl::EGLContext; #[cfg(feature = "native_lib")] -use backend::egl::{EGLDisplay, EGLGraphicsBackend}; +use crate::backend::egl::{EGLDisplay, EGLGraphicsBackend}; pub mod error; use self::error::*; @@ -87,7 +87,7 @@ where where L: Into>, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_egl")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_egl")); dev.clear_handler(); diff --git a/src/backend/drm/egl/session.rs b/src/backend/drm/egl/session.rs index aa8d213..ae404d0 100644 --- a/src/backend/drm/egl/session.rs +++ b/src/backend/drm/egl/session.rs @@ -7,9 +7,9 @@ use drm::control::crtc; use std::os::unix::io::RawFd; use super::EglDevice; -use backend::drm::Device; -use backend::egl::native::{Backend, NativeDisplay, NativeSurface}; -use backend::session::{AsSessionObserver, SessionObserver}; +use crate::backend::drm::Device; +use crate::backend::egl::native::{Backend, NativeDisplay, NativeSurface}; +use crate::backend::session::{AsSessionObserver, SessionObserver}; /// [`SessionObserver`](SessionObserver) /// linked to the [`EglDevice`](EglDevice) it was diff --git a/src/backend/drm/egl/surface.rs b/src/backend/drm/egl/surface.rs index 064825e..7ed7b20 100644 --- a/src/backend/drm/egl/surface.rs +++ b/src/backend/drm/egl/surface.rs @@ -3,14 +3,14 @@ use nix::libc::c_void; use std::rc::Rc; use super::error::*; -use backend::drm::{Device, Surface}; -use backend::egl::native::{Backend, NativeDisplay, NativeSurface}; -use backend::egl::{EGLContext, EGLSurface}; +use crate::backend::drm::{Device, Surface}; +use crate::backend::egl::native::{Backend, NativeDisplay, NativeSurface}; +use crate::backend::egl::{EGLContext, EGLSurface}; #[cfg(feature = "renderer_gl")] -use backend::graphics::gl::GLGraphicsBackend; +use crate::backend::graphics::gl::GLGraphicsBackend; #[cfg(feature = "renderer_gl")] -use backend::graphics::PixelFormat; -use backend::graphics::{CursorBackend, SwapBuffersError}; +use crate::backend::graphics::PixelFormat; +use crate::backend::graphics::{CursorBackend, SwapBuffersError}; /// Egl surface for rendering pub struct EglSurface diff --git a/src/backend/drm/gbm/egl.rs b/src/backend/drm/gbm/egl.rs index a479d0b..d2d32e7 100644 --- a/src/backend/drm/gbm/egl.rs +++ b/src/backend/drm/gbm/egl.rs @@ -4,11 +4,11 @@ //! [`GbmDevice`](GbmDevice) and [`GbmSurface`](GbmSurface). //! -use backend::drm::{Device, RawDevice}; -use backend::egl::error::Result as EglResult; -use backend::egl::ffi; -use backend::egl::native::{Backend, NativeDisplay, NativeSurface}; -use backend::graphics::SwapBuffersError; +use crate::backend::drm::{Device, RawDevice}; +use crate::backend::egl::error::Result as EglResult; +use crate::backend::egl::ffi; +use crate::backend::egl::native::{Backend, NativeDisplay, NativeSurface}; +use crate::backend::graphics::SwapBuffersError; use super::error::{Error, Result}; use super::{GbmDevice, GbmSurface}; diff --git a/src/backend/drm/gbm/error.rs b/src/backend/drm/gbm/error.rs index 46aad9d..3b1c751 100644 --- a/src/backend/drm/gbm/error.rs +++ b/src/backend/drm/gbm/error.rs @@ -49,6 +49,6 @@ error_chain! { } foreign_links { - FailedToSwap(::backend::graphics::SwapBuffersError) #[doc = "Swapping front buffers failed"]; + FailedToSwap(crate::backend::graphics::SwapBuffersError) #[doc = "Swapping front buffers failed"]; } } diff --git a/src/backend/drm/gbm/mod.rs b/src/backend/drm/gbm/mod.rs index af25d00..0395d14 100644 --- a/src/backend/drm/gbm/mod.rs +++ b/src/backend/drm/gbm/mod.rs @@ -65,7 +65,7 @@ impl GbmDevice { ); }); - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_gbm")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_gbm")); dev.clear_handler(); diff --git a/src/backend/drm/gbm/session.rs b/src/backend/drm/gbm/session.rs index 9f0c135..8d27030 100644 --- a/src/backend/drm/gbm/session.rs +++ b/src/backend/drm/gbm/session.rs @@ -11,8 +11,8 @@ use std::os::unix::io::RawFd; use std::rc::{Rc, Weak}; use super::{GbmDevice, GbmSurfaceInternal}; -use backend::drm::{RawDevice, RawSurface}; -use backend::session::{AsSessionObserver, SessionObserver}; +use crate::backend::drm::{RawDevice, RawSurface}; +use crate::backend::session::{AsSessionObserver, SessionObserver}; /// [`SessionObserver`](SessionObserver) /// linked to the [`GbmDevice`](GbmDevice) it was diff --git a/src/backend/drm/gbm/surface.rs b/src/backend/drm/gbm/surface.rs index c1b99be..441c44b 100644 --- a/src/backend/drm/gbm/surface.rs +++ b/src/backend/drm/gbm/surface.rs @@ -10,9 +10,9 @@ use std::os::unix::io::AsRawFd; use std::rc::Rc; #[cfg(feature = "backend_drm_legacy")] -use backend::drm::legacy::LegacyDrmDevice; -use backend::graphics::CursorBackend; -use backend::graphics::SwapBuffersError; +use crate::backend::drm::legacy::LegacyDrmDevice; +use crate::backend::graphics::CursorBackend; +use crate::backend::graphics::SwapBuffersError; pub(super) struct GbmSurfaceInternal { pub(super) dev: Rc>>, diff --git a/src/backend/drm/legacy/error.rs b/src/backend/drm/legacy/error.rs index d657194..dc51b0f 100644 --- a/src/backend/drm/legacy/error.rs +++ b/src/backend/drm/legacy/error.rs @@ -49,6 +49,6 @@ error_chain! { } foreign_links { - FailedToSwap(::backend::graphics::SwapBuffersError) #[doc = "Swapping front buffers failed"]; + FailedToSwap(crate::backend::graphics::SwapBuffersError) #[doc = "Swapping front buffers failed"]; } } diff --git a/src/backend/drm/legacy/mod.rs b/src/backend/drm/legacy/mod.rs index fadcaa4..dea1b9a 100644 --- a/src/backend/drm/legacy/mod.rs +++ b/src/backend/drm/legacy/mod.rs @@ -94,7 +94,7 @@ impl LegacyDrmDevice { where L: Into>, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_drm")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_drm")); info!(log, "DrmDevice initializing"); let dev_id = fstat(dev.as_raw_fd()) diff --git a/src/backend/drm/legacy/session.rs b/src/backend/drm/legacy/session.rs index 3ba2077..3edaaef 100644 --- a/src/backend/drm/legacy/session.rs +++ b/src/backend/drm/legacy/session.rs @@ -15,7 +15,7 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use super::{Dev, LegacyDrmDevice, LegacyDrmSurfaceInternal}; -use backend::session::{AsSessionObserver, SessionObserver}; +use crate::backend::session::{AsSessionObserver, SessionObserver}; /// [`SessionObserver`](SessionObserver) /// linked to the [`LegacyDrmDevice`](LegacyDrmDevice) diff --git a/src/backend/drm/legacy/surface.rs b/src/backend/drm/legacy/surface.rs index e960174..7dda6b2 100644 --- a/src/backend/drm/legacy/surface.rs +++ b/src/backend/drm/legacy/surface.rs @@ -7,9 +7,9 @@ use std::os::unix::io::{AsRawFd, RawFd}; use std::rc::Rc; use std::sync::RwLock; -use backend::drm::{DevPath, RawSurface, Surface}; -use backend::graphics::CursorBackend; -use backend::graphics::SwapBuffersError; +use crate::backend::drm::{DevPath, RawSurface, Surface}; +use crate::backend::graphics::CursorBackend; +use crate::backend::graphics::SwapBuffersError; use super::{error::*, Dev}; diff --git a/src/backend/egl/context.rs b/src/backend/egl/context.rs index 7133899..9f3322d 100644 --- a/src/backend/egl/context.rs +++ b/src/backend/egl/context.rs @@ -1,7 +1,7 @@ //! EGL context related structs use super::{error::*, ffi, native, EGLSurface}; -use backend::graphics::PixelFormat; +use crate::backend::graphics::PixelFormat; use nix::libc::{c_int, c_void}; use slog; use std::{ @@ -36,7 +36,7 @@ impl> EGLContext { where L: Into>, { - let log = ::slog_or_stdlog(logger.into()).new(o!("smithay_module" => "renderer_egl")); + let log = crate::slog_or_stdlog(logger.into()).new(o!("smithay_module" => "renderer_egl")); let ptr = native.ptr()?; let (context, display, config_id, surface_attributes, pixel_format, wl_drm_support) = unsafe { EGLContext::::new_internal(ptr, attributes, reqs, log.clone()) }?; diff --git a/src/backend/egl/mod.rs b/src/backend/egl/mod.rs index d68f5cd..a1f0486 100644 --- a/src/backend/egl/mod.rs +++ b/src/backend/egl/mod.rs @@ -19,7 +19,7 @@ //! of an EGL-based [`WlBuffer`](wayland_server::protocol::wl_buffer::WlBuffer) for rendering. #[cfg(feature = "renderer_gl")] -use backend::graphics::gl::ffi as gl_ffi; +use crate::backend::graphics::gl::ffi as gl_ffi; use nix::libc::c_uint; use std::{ ffi::CStr, diff --git a/src/backend/egl/native.rs b/src/backend/egl/native.rs index 9d797a9..cb13e0a 100644 --- a/src/backend/egl/native.rs +++ b/src/backend/egl/native.rs @@ -1,7 +1,7 @@ //! Type safe native types for safe context/surface creation use super::{error::*, ffi}; -use backend::graphics::SwapBuffersError; +use crate::backend::graphics::SwapBuffersError; #[cfg(feature = "backend_winit")] use std::ptr; diff --git a/src/backend/egl/surface.rs b/src/backend/egl/surface.rs index df3ac31..45e8814 100644 --- a/src/backend/egl/surface.rs +++ b/src/backend/egl/surface.rs @@ -1,7 +1,7 @@ //! EGL surface related structs use super::{error::*, ffi, native, EGLContext}; -use backend::graphics::SwapBuffersError; +use crate::backend::graphics::SwapBuffersError; use nix::libc::c_int; use std::{ cell::Cell, diff --git a/src/backend/graphics/glium.rs b/src/backend/graphics/glium.rs index d146a28..b71287b 100644 --- a/src/backend/graphics/glium.rs +++ b/src/backend/graphics/glium.rs @@ -1,6 +1,6 @@ //! Glium compatibility module -use backend::graphics::{gl::GLGraphicsBackend, SwapBuffersError}; +use crate::backend::graphics::{gl::GLGraphicsBackend, SwapBuffersError}; use glium::{ backend::{Backend, Context, Facade}, debug::DebugCallbackBehavior, diff --git a/src/backend/libinput.rs b/src/backend/libinput.rs index dbeca0a..0c5fd98 100644 --- a/src/backend/libinput.rs +++ b/src/backend/libinput.rs @@ -1,8 +1,8 @@ //! Implementation of input backend trait for types provided by `libinput` -use backend::input::{self as backend, Axis, InputBackend}; +use crate::backend::input::{self as backend, Axis, InputBackend}; #[cfg(feature = "backend_session")] -use backend::session::{AsErrno, Session, SessionObserver}; +use crate::backend::session::{AsErrno, Session, SessionObserver}; use input as libinput; use input::event; @@ -46,7 +46,7 @@ impl LibinputInputBackend { where L: Into>, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_libinput")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_libinput")); info!(log, "Initializing a libinput backend"); LibinputInputBackend { context, @@ -612,7 +612,7 @@ pub fn libinput_bind( source.set_interest(Ready::readable()); handle.insert_source(source, move |evt, _| { - use backend::input::InputBackend; + use crate::backend::input::InputBackend; let mut backend = evt.source.borrow_mut(); if let Err(error) = backend.0.dispatch_new_events() { diff --git a/src/backend/session/auto.rs b/src/backend/session/auto.rs index 3fe1aed..8196a4c 100644 --- a/src/backend/session/auto.rs +++ b/src/backend/session/auto.rs @@ -88,7 +88,7 @@ impl AutoSession { where L: Into>, { - let logger = ::slog_or_stdlog(logger) + let logger = crate::slog_or_stdlog(logger) .new(o!("smithay_module" => "backend_session_auto", "session_type" => "auto")); info!(logger, "Trying to create logind session"); @@ -121,7 +121,7 @@ impl AutoSession { where L: Into>, { - let logger = ::slog_or_stdlog(logger) + let logger = crate::slog_or_stdlog(logger) .new(o!("smithay_module" => "backend_session_auto", "session_type" => "auto")); info!(logger, "Trying to create tty session"); diff --git a/src/backend/session/dbus/logind.rs b/src/backend/session/dbus/logind.rs index 6a02bef..2f66113 100644 --- a/src/backend/session/dbus/logind.rs +++ b/src/backend/session/dbus/logind.rs @@ -31,7 +31,7 @@ //! It is crucial to avoid errors during that state. Examples for object that might be registered //! for notifications are the [`Libinput`](input::Libinput) context or the [`Device`](::backend::drm::Device). -use backend::session::{AsErrno, Session, SessionNotifier, SessionObserver}; +use crate::backend::session::{AsErrno, Session, SessionNotifier, SessionObserver}; use dbus::{ BusName, BusType, Connection, ConnectionItem, ConnectionItems, Interface, Member, Message, MessageItem, OwnedFd, Path as DbusPath, Watch, WatchEvent, @@ -84,7 +84,7 @@ impl LogindSession { where L: Into>, { - let logger = ::slog_or_stdlog(logger) + let logger = crate::slog_or_stdlog(logger) .new(o!("smithay_module" => "backend_session", "session_type" => "logind")); // Acquire session_id, seat and vt (if any) via libsystemd diff --git a/src/backend/session/direct.rs b/src/backend/session/direct.rs index 00bb98d..a21699a 100644 --- a/src/backend/session/direct.rs +++ b/src/backend/session/direct.rs @@ -175,7 +175,7 @@ impl DirectSession { where L: Into>, { - let logger = ::slog_or_stdlog(logger) + let logger = crate::slog_or_stdlog(logger) .new(o!("smithay_module" => "backend_session", "session_type" => "direct/vt")); let fd = tty diff --git a/src/backend/udev.rs b/src/backend/udev.rs index 2501563..0ff2520 100644 --- a/src/backend/udev.rs +++ b/src/backend/udev.rs @@ -59,7 +59,7 @@ impl UdevBackend { where L: Into>, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_udev")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_udev")); let devices = all_gpus(context, seat)? .into_iter() diff --git a/src/backend/winit.rs b/src/backend/winit.rs index 2ad70b6..68b1e9b 100644 --- a/src/backend/winit.rs +++ b/src/backend/winit.rs @@ -1,6 +1,6 @@ //! Implementation of backend traits for types provided by `winit` -use backend::{ +use crate::backend::{ egl::{ context::GlAttributes, error::Result as EGLResult, native, EGLContext, EGLDisplay, EGLGraphicsBackend, EGLSurface, @@ -30,7 +30,7 @@ use winit::{ /// Errors thrown by the `winit` backends pub mod errors { - use backend::egl::error as egl_error; + use crate::backend::egl::error as egl_error; error_chain! { errors { @@ -152,7 +152,7 @@ pub fn init_from_builder_with_gl_attr( where L: Into>, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_winit")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "backend_winit")); info!(log, "Initializing a winit backend"); let events_loop = EventsLoop::new(); diff --git a/src/wayland/compositor/mod.rs b/src/wayland/compositor/mod.rs index f795c50..84b3718 100644 --- a/src/wayland/compositor/mod.rs +++ b/src/wayland/compositor/mod.rs @@ -90,7 +90,7 @@ use self::{ roles::{Role, RoleType, WrongRole}, tree::SurfaceData, }; -use utils::Rectangle; +use crate::utils::Rectangle; use wayland_server::{ protocol::{ wl_buffer, wl_callback, wl_compositor, wl_output, wl_region, wl_subcompositor, wl_surface::WlSurface, @@ -467,7 +467,7 @@ where R: Default + RoleType + Role + 'static, Impl: FnMut(SurfaceEvent, Resource, CompositorToken) + 'static, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "compositor_handler")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "compositor_handler")); let implem = Rc::new(RefCell::new(implem)); let comp_token = display.get_token(); diff --git a/src/wayland/data_device/dnd_grab.rs b/src/wayland/data_device/dnd_grab.rs index b72449e..e775d84 100644 --- a/src/wayland/data_device/dnd_grab.rs +++ b/src/wayland/data_device/dnd_grab.rs @@ -8,7 +8,7 @@ use wayland_server::{ NewResource, Resource, }; -use wayland::{ +use crate::wayland::{ compositor::{roles::Role, CompositorToken}, seat::{AxisFrame, PointerGrab, PointerInnerHandle, Seat}, }; diff --git a/src/wayland/data_device/mod.rs b/src/wayland/data_device/mod.rs index e883cd6..c9eb113 100644 --- a/src/wayland/data_device/mod.rs +++ b/src/wayland/data_device/mod.rs @@ -68,7 +68,7 @@ use wayland_server::{ Client, Display, Global, NewResource, Resource, }; -use wayland::{ +use crate::wayland::{ compositor::{roles::Role, CompositorToken}, seat::Seat, }; @@ -294,7 +294,7 @@ where U: 'static, L: Into>, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "data_device_mgr")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "data_device_mgr")); let action_choice = Arc::new(Mutex::new(action_choice)); let callback = Arc::new(Mutex::new(callback)); let global = display.create_global(3, move |new_ddm, _version| { diff --git a/src/wayland/data_device/server_dnd_grab.rs b/src/wayland/data_device/server_dnd_grab.rs index b48b49e..c885e55 100644 --- a/src/wayland/data_device/server_dnd_grab.rs +++ b/src/wayland/data_device/server_dnd_grab.rs @@ -6,7 +6,7 @@ use wayland_server::{ NewResource, Resource, }; -use wayland::seat::{AxisFrame, PointerGrab, PointerInnerHandle, Seat}; +use crate::wayland::seat::{AxisFrame, PointerGrab, PointerInnerHandle, Seat}; use super::{DataDeviceData, SeatData}; diff --git a/src/wayland/output/mod.rs b/src/wayland/output/mod.rs index 1df3266..51e0f70 100644 --- a/src/wayland/output/mod.rs +++ b/src/wayland/output/mod.rs @@ -179,7 +179,7 @@ impl Output { where L: Into>, { - let log = ::slog_or_stdlog(logger).new(o!("smithay_module" => "output_handler")); + let log = crate::slog_or_stdlog(logger).new(o!("smithay_module" => "output_handler")); info!(log, "Creating new wl_output"; "name" => &name); diff --git a/src/wayland/seat/keyboard.rs b/src/wayland/seat/keyboard.rs index 7c71dfc..556d34c 100644 --- a/src/wayland/seat/keyboard.rs +++ b/src/wayland/seat/keyboard.rs @@ -1,4 +1,4 @@ -use backend::input::KeyState; +use crate::backend::input::KeyState; use std::{ default::Default, io::{Error as IoError, Write}, diff --git a/src/wayland/seat/mod.rs b/src/wayland/seat/mod.rs index 77050f8..2e56f78 100644 --- a/src/wayland/seat/mod.rs +++ b/src/wayland/seat/mod.rs @@ -55,7 +55,7 @@ pub use self::{ }, }; -use wayland::compositor::{roles::Role, CompositorToken}; +use crate::wayland::compositor::{roles::Role, CompositorToken}; use wayland_commons::utils::UserDataMap; @@ -133,7 +133,7 @@ impl Seat { R: Role + 'static, L: Into>, { - let log = ::slog_or_stdlog(logger); + let log = crate::slog_or_stdlog(logger); let arc = Arc::new(SeatArc { inner: Mutex::new(Inner { pointer: None, diff --git a/src/wayland/seat/pointer.rs b/src/wayland/seat/pointer.rs index 15ce763..3150577 100644 --- a/src/wayland/seat/pointer.rs +++ b/src/wayland/seat/pointer.rs @@ -7,7 +7,7 @@ use wayland_server::{ NewResource, Resource, }; -use wayland::compositor::{roles::Role, CompositorToken}; +use crate::wayland::compositor::{roles::Role, CompositorToken}; /// The role representing a surface set as the pointer cursor #[derive(Default, Copy, Clone)] diff --git a/src/wayland/shell/legacy/mod.rs b/src/wayland/shell/legacy/mod.rs index d02a56e..c994f9a 100644 --- a/src/wayland/shell/legacy/mod.rs +++ b/src/wayland/shell/legacy/mod.rs @@ -76,7 +76,7 @@ use std::{ sync::{Arc, Mutex}, }; -use wayland::compositor::{roles::Role, CompositorToken}; +use crate::wayland::compositor::{roles::Role, CompositorToken}; use wayland_server::{ protocol::{wl_output, wl_seat, wl_shell, wl_shell_surface, wl_surface}, @@ -327,7 +327,7 @@ where L: Into>, Impl: FnMut(ShellRequest) + 'static, { - let _log = ::slog_or_stdlog(logger); + let _log = crate::slog_or_stdlog(logger); let implementation = Rc::new(RefCell::new(implementation)); diff --git a/src/wayland/shell/legacy/wl_handlers.rs b/src/wayland/shell/legacy/wl_handlers.rs index b72c570..b39bd80 100644 --- a/src/wayland/shell/legacy/wl_handlers.rs +++ b/src/wayland/shell/legacy/wl_handlers.rs @@ -9,7 +9,7 @@ use wayland_server::{ DisplayToken, NewResource, Resource, }; -use wayland::compositor::{roles::Role, CompositorToken}; +use crate::wayland::compositor::{roles::Role, CompositorToken}; use super::{ShellRequest, ShellState, ShellSurface, ShellSurfaceKind, ShellSurfaceRole}; diff --git a/src/wayland/shell/xdg/mod.rs b/src/wayland/shell/xdg/mod.rs index 08b4151..632a75c 100644 --- a/src/wayland/shell/xdg/mod.rs +++ b/src/wayland/shell/xdg/mod.rs @@ -95,8 +95,8 @@ use std::{ rc::Rc, sync::{Arc, Mutex}, }; -use utils::Rectangle; -use wayland::compositor::{roles::Role, CompositorToken}; +use crate::utils::Rectangle; +use crate::wayland::compositor::{roles::Role, CompositorToken}; use wayland_protocols::{ unstable::xdg_shell::v6::server::{zxdg_popup_v6, zxdg_shell_v6, zxdg_surface_v6, zxdg_toplevel_v6}, xdg_shell::server::{xdg_popup, xdg_positioner, xdg_surface, xdg_toplevel, xdg_wm_base}, @@ -297,7 +297,7 @@ where L: Into>, Impl: FnMut(XdgRequest) + 'static, { - let log = ::slog_or_stdlog(logger); + let log = crate::slog_or_stdlog(logger); let shell_state = Arc::new(Mutex::new(ShellState { known_toplevels: Vec::new(), known_popups: Vec::new(), diff --git a/src/wayland/shell/xdg/xdg_handlers.rs b/src/wayland/shell/xdg/xdg_handlers.rs index dd722cb..9fe17b4 100644 --- a/src/wayland/shell/xdg/xdg_handlers.rs +++ b/src/wayland/shell/xdg/xdg_handlers.rs @@ -1,12 +1,12 @@ use std::{cell::RefCell, sync::Mutex}; -use wayland::compositor::{roles::*, CompositorToken}; +use crate::wayland::compositor::{roles::*, CompositorToken}; use wayland_protocols::xdg_shell::server::{ xdg_popup, xdg_positioner, xdg_surface, xdg_toplevel, xdg_wm_base, }; use wayland_server::{protocol::wl_surface, DisplayToken, NewResource, Resource}; -use utils::Rectangle; +use crate::utils::Rectangle; use super::{ make_shell_client_data, PopupConfigure, PopupKind, PopupState, PositionerState, ShellClient, diff --git a/src/wayland/shell/xdg/zxdgv6_handlers.rs b/src/wayland/shell/xdg/zxdgv6_handlers.rs index eb8cc17..a62f436 100644 --- a/src/wayland/shell/xdg/zxdgv6_handlers.rs +++ b/src/wayland/shell/xdg/zxdgv6_handlers.rs @@ -1,6 +1,6 @@ use std::{cell::RefCell, sync::Mutex}; -use wayland::compositor::{roles::*, CompositorToken}; +use crate::wayland::compositor::{roles::*, CompositorToken}; use wayland_protocols::{ unstable::xdg_shell::v6::server::{ zxdg_popup_v6, zxdg_positioner_v6, zxdg_shell_v6, zxdg_surface_v6, zxdg_toplevel_v6, @@ -9,7 +9,7 @@ use wayland_protocols::{ }; use wayland_server::{protocol::wl_surface, DisplayToken, NewResource, Resource}; -use utils::Rectangle; +use crate::utils::Rectangle; use super::{ make_shell_client_data, PopupConfigure, PopupKind, PopupState, PositionerState, ShellClient, diff --git a/src/wayland/shm/mod.rs b/src/wayland/shm/mod.rs index fe673a6..e0f0506 100644 --- a/src/wayland/shm/mod.rs +++ b/src/wayland/shm/mod.rs @@ -115,7 +115,7 @@ pub fn init_shm_global( where L: Into>, { - let log = ::slog_or_stdlog(logger); + let log = crate::slog_or_stdlog(logger); // always add the mandatory formats formats.push(wl_shm::Format::Argb8888); diff --git a/src/xwayland/xserver.rs b/src/xwayland/xserver.rs index 32eb4c2..fb76835 100644 --- a/src/xwayland/xserver.rs +++ b/src/xwayland/xserver.rs @@ -86,7 +86,7 @@ impl XWayland { where L: Into>, { - let log = ::slog_or_stdlog(logger); + let log = crate::slog_or_stdlog(logger); let inner = Rc::new(RefCell::new(Inner { wm, source_maker: Box::new(move |inner| {