From 12e3b4c70b5ef23b2fdfc197296d483680e125f9 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 8 Feb 2019 14:49:43 +0300 Subject: reformat the world --- crates/ra_arena/src/lib.rs | 20 ++++---------------- crates/ra_arena/src/map.rs | 10 ++-------- 2 files changed, 6 insertions(+), 24 deletions(-) (limited to 'crates/ra_arena/src') diff --git a/crates/ra_arena/src/lib.rs b/crates/ra_arena/src/lib.rs index 97f554838..1c97c2662 100644 --- a/crates/ra_arena/src/lib.rs +++ b/crates/ra_arena/src/lib.rs @@ -44,10 +44,7 @@ pub struct Arena { impl fmt::Debug for Arena { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { - fmt.debug_struct("Arena") - .field("len", &self.len()) - .field("data", &self.data) - .finish() + fmt.debug_struct("Arena").field("len", &self.len()).field("data", &self.data).finish() } } @@ -80,19 +77,13 @@ impl Arena { ID::from_raw(id) } pub fn iter<'a>(&'a self) -> impl Iterator { - self.data - .iter() - .enumerate() - .map(|(idx, value)| (ID::from_raw(RawId(idx as u32)), value)) + self.data.iter().enumerate().map(|(idx, value)| (ID::from_raw(RawId(idx as u32)), value)) } } impl Default for Arena { fn default() -> Arena { - Arena { - data: Vec::new(), - _ty: PhantomData, - } + Arena { data: Vec::new(), _ty: PhantomData } } } @@ -116,9 +107,6 @@ impl FromIterator for Arena { where I: IntoIterator, { - Arena { - data: Vec::from_iter(iter), - _ty: PhantomData, - } + Arena { data: Vec::from_iter(iter), _ty: PhantomData } } } diff --git a/crates/ra_arena/src/map.rs b/crates/ra_arena/src/map.rs index be80edaf3..b73d4e365 100644 --- a/crates/ra_arena/src/map.rs +++ b/crates/ra_arena/src/map.rs @@ -42,10 +42,7 @@ impl ArenaMap { } pub fn iter(&self) -> impl Iterator { - self.v - .iter() - .enumerate() - .filter_map(|(idx, o)| Some((Self::from_idx(idx), o.as_ref()?))) + self.v.iter().enumerate().filter_map(|(idx, o)| Some((Self::from_idx(idx), o.as_ref()?))) } fn to_idx(id: ID) -> usize { @@ -66,9 +63,6 @@ impl std::ops::Index for ArenaMap { impl Default for ArenaMap { fn default() -> Self { - ArenaMap { - v: Vec::new(), - _ty: PhantomData, - } + ArenaMap { v: Vec::new(), _ty: PhantomData } } } -- cgit v1.2.3