From fcd4b0176f1544b389c9b028c547a1dfc92f9a56 Mon Sep 17 00:00:00 2001
From: Igor Aleksanov <popzxc@yandex.ru>
Date: Wed, 12 Aug 2020 14:08:55 +0300
Subject: Revert style preference-related fixes

---
 crates/flycheck/src/lib.rs                       |  1 -
 crates/ra_arena/src/map.rs                       | 10 +++++-----
 crates/ra_parser/src/grammar/expressions/atom.rs |  8 +++++---
 crates/vfs/src/file_set.rs                       |  3 ---
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'crates')

diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs
index ec769459c..7c38f5ef9 100644
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@@ -106,7 +106,6 @@ struct FlycheckActor {
     cargo_handle: Option<CargoHandle>,
 }
 
-#[allow(clippy::large_enum_variant)]
 enum Event {
     Restart(Restart),
     CheckEvent(Option<cargo_metadata::Message>),
diff --git a/crates/ra_arena/src/map.rs b/crates/ra_arena/src/map.rs
index c1b58712c..0f33907c0 100644
--- a/crates/ra_arena/src/map.rs
+++ b/crates/ra_arena/src/map.rs
@@ -13,18 +13,18 @@ pub struct ArenaMap<ID, V> {
 
 impl<T, V> ArenaMap<Idx<T>, V> {
     pub fn insert(&mut self, id: Idx<T>, t: V) {
-        let idx = Self::into_idx(id);
+        let idx = Self::to_idx(id);
 
         self.v.resize_with((idx + 1).max(self.v.len()), || None);
         self.v[idx] = Some(t);
     }
 
     pub fn get(&self, id: Idx<T>) -> Option<&V> {
-        self.v.get(Self::into_idx(id)).and_then(|it| it.as_ref())
+        self.v.get(Self::to_idx(id)).and_then(|it| it.as_ref())
     }
 
     pub fn get_mut(&mut self, id: Idx<T>) -> Option<&mut V> {
-        self.v.get_mut(Self::into_idx(id)).and_then(|it| it.as_mut())
+        self.v.get_mut(Self::to_idx(id)).and_then(|it| it.as_mut())
     }
 
     pub fn values(&self) -> impl Iterator<Item = &V> {
@@ -39,7 +39,7 @@ impl<T, V> ArenaMap<Idx<T>, V> {
         self.v.iter().enumerate().filter_map(|(idx, o)| Some((Self::from_idx(idx), o.as_ref()?)))
     }
 
-    fn into_idx(id: Idx<T>) -> usize {
+    fn to_idx(id: Idx<T>) -> usize {
         u32::from(id.into_raw()) as usize
     }
 
@@ -51,7 +51,7 @@ impl<T, V> ArenaMap<Idx<T>, V> {
 impl<T, V> std::ops::Index<Idx<V>> for ArenaMap<Idx<V>, T> {
     type Output = T;
     fn index(&self, id: Idx<V>) -> &T {
-        self.v[Self::into_idx(id)].as_ref().unwrap()
+        self.v[Self::to_idx(id)].as_ref().unwrap()
     }
 }
 
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index ca6569c9f..0b01d3bc6 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -243,10 +243,12 @@ fn lambda_expr(p: &mut Parser) -> CompletedMarker {
         // test lambda_ret_block
         // fn main() { || -> i32 { 92 }(); }
         block_expr(p);
-    } else if p.at_ts(EXPR_FIRST) {
-        expr(p);
     } else {
-        p.error("expected expression");
+        if p.at_ts(EXPR_FIRST) {
+            expr(p);
+        } else {
+            p.error("expected expression");
+        }
     }
     m.complete(p, CLOSURE_EXPR)
 }
diff --git a/crates/vfs/src/file_set.rs b/crates/vfs/src/file_set.rs
index 9f11268ee..e9196fcd2 100644
--- a/crates/vfs/src/file_set.rs
+++ b/crates/vfs/src/file_set.rs
@@ -19,9 +19,6 @@ impl FileSet {
     pub fn len(&self) -> usize {
         self.files.len()
     }
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
-    }
     pub fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> {
         let mut base = self.paths[&anchor].clone();
         base.pop();
-- 
cgit v1.2.3