From 6dfcef1f49b9b4d4ec345a4acd776d84527a6555 Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Tue, 17 Apr 2018 11:03:57 +0200
Subject: [PATCH] Remove unstable rustfmt options

---
 .rustfmt.toml                  | 9 ---------
 src/wayland/compositor/mod.rs  | 2 +-
 src/wayland/compositor/tree.rs | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.rustfmt.toml b/.rustfmt.toml
index 0409b3d..284d219 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,10 +1 @@
-error_on_line_overflow = false
-fn_args_density = "Compressed"
-fn_args_layout = "Visual"
-fn_arg_intent = "Tabbed"
-reorder_imports = true
-reorder_imported_names = true
-report_todo = "Never"
-report_fixme = "Never"
-use_try_shorthand = true
 max_width = 110
diff --git a/src/wayland/compositor/mod.rs b/src/wayland/compositor/mod.rs
index 7335211..e0c67bf 100644
--- a/src/wayland/compositor/mod.rs
+++ b/src/wayland/compositor/mod.rs
@@ -93,7 +93,7 @@ use utils::Rectangle;
 use wayland_server::{Display, Global, LoopToken, NewResource, Resource};
 use wayland_server::commons::Implementation;
 use wayland_server::protocol::{wl_buffer, wl_callback, wl_compositor, wl_output, wl_region, wl_subcompositor};
-use wayland_server::protocol::wl_surface::{self, WlSurface};
+use wayland_server::protocol::wl_surface::WlSurface;
 
 /// Description of which part of a surface
 /// should be considered damaged and needs to be redrawn
diff --git a/src/wayland/compositor/tree.rs b/src/wayland/compositor/tree.rs
index 2c8edb7..d0fda29 100644
--- a/src/wayland/compositor/tree.rs
+++ b/src/wayland/compositor/tree.rs
@@ -2,7 +2,7 @@ use super::{SubsurfaceRole, SurfaceAttributes};
 use super::roles::*;
 use std::sync::Mutex;
 use wayland_server::Resource;
-use wayland_server::protocol::wl_surface::{self, WlSurface};
+use wayland_server::protocol::wl_surface::WlSurface;
 
 /// Node of a subsurface tree, holding some user specified data type U
 /// at each node