From 461265825bf8bf4382a428629a9bff9b6b1665e0 Mon Sep 17 00:00:00 2001 From: Waffle Date: Thu, 8 Oct 2020 20:08:40 +0300 Subject: [PATCH] Remove multiline `use`s --- library/core/src/iter/adapters/chain.rs | 7 ++----- library/core/src/iter/adapters/cloned.rs | 9 +++------ library/core/src/iter/adapters/copied.rs | 9 +++------ library/core/src/iter/adapters/enumerate.rs | 10 +++------- library/core/src/iter/adapters/filter.rs | 8 +++----- library/core/src/iter/adapters/filter_map.rs | 9 +++------ library/core/src/iter/adapters/flatten.rs | 8 +++----- library/core/src/iter/adapters/fuse.rs | 12 ++++-------- library/core/src/iter/adapters/inspect.rs | 8 +++----- library/core/src/iter/adapters/map.rs | 12 ++++-------- library/core/src/iter/adapters/map_while.rs | 8 +++----- library/core/src/iter/adapters/mod.rs | 6 ++---- library/core/src/iter/adapters/peekable.rs | 6 ++---- library/core/src/iter/adapters/rev.rs | 6 ++---- library/core/src/iter/adapters/scan.rs | 8 +++----- library/core/src/iter/adapters/skip.rs | 6 ++---- library/core/src/iter/adapters/skip_while.rs | 8 +++----- library/core/src/iter/adapters/take.rs | 8 +++----- library/core/src/iter/adapters/take_while.rs | 8 +++----- library/core/src/iter/adapters/zip.rs | 12 ++++-------- library/core/src/iter/sources/empty.rs | 8 +++----- 21 files changed, 61 insertions(+), 115 deletions(-) diff --git a/library/core/src/iter/adapters/chain.rs b/library/core/src/iter/adapters/chain.rs index 86a005f340840..9753e1b43ba95 100644 --- a/library/core/src/iter/adapters/chain.rs +++ b/library/core/src/iter/adapters/chain.rs @@ -1,8 +1,5 @@ -use crate::{ - iter::{DoubleEndedIterator, FusedIterator, Iterator, TrustedLen}, - ops::Try, - usize, -}; +use crate::iter::{DoubleEndedIterator, FusedIterator, Iterator, TrustedLen}; +use crate::{ops::Try, usize}; /// An iterator that links two iterators together, in a chain. /// diff --git a/library/core/src/iter/adapters/cloned.rs b/library/core/src/iter/adapters/cloned.rs index da523c836561b..7da47dcd2d147 100644 --- a/library/core/src/iter/adapters/cloned.rs +++ b/library/core/src/iter/adapters/cloned.rs @@ -1,9 +1,6 @@ -use crate::{ - iter::{ - adapters::zip::try_get_unchecked, adapters::TrustedRandomAccess, FusedIterator, TrustedLen, - }, - ops::Try, -}; +use crate::iter::adapters::{zip::try_get_unchecked, TrustedRandomAccess}; +use crate::iter::{FusedIterator, TrustedLen}; +use crate::ops::Try; /// An iterator that clones the elements of an underlying iterator. /// diff --git a/library/core/src/iter/adapters/copied.rs b/library/core/src/iter/adapters/copied.rs index 98e231498c9a6..46f22354111a6 100644 --- a/library/core/src/iter/adapters/copied.rs +++ b/library/core/src/iter/adapters/copied.rs @@ -1,9 +1,6 @@ -use crate::{ - iter::{ - adapters::zip::try_get_unchecked, adapters::TrustedRandomAccess, FusedIterator, TrustedLen, - }, - ops::Try, -}; +use crate::iter::adapters::{zip::try_get_unchecked, TrustedRandomAccess}; +use crate::iter::{FusedIterator, TrustedLen}; +use crate::ops::Try; /// An iterator that copies the elements of an underlying iterator. /// diff --git a/library/core/src/iter/adapters/enumerate.rs b/library/core/src/iter/adapters/enumerate.rs index c42028ddeed69..5978c2da98c35 100644 --- a/library/core/src/iter/adapters/enumerate.rs +++ b/library/core/src/iter/adapters/enumerate.rs @@ -1,10 +1,6 @@ -use crate::{ - iter::{ - adapters::{zip::try_get_unchecked, SourceIter, TrustedRandomAccess}, - FusedIterator, InPlaceIterable, TrustedLen, - }, - ops::{Add, AddAssign, Try}, -}; +use crate::iter::adapters::{zip::try_get_unchecked, SourceIter, TrustedRandomAccess}; +use crate::iter::{FusedIterator, InPlaceIterable, TrustedLen}; +use crate::ops::{Add, AddAssign, Try}; /// An iterator that yields the current count and the element during iteration. /// diff --git a/library/core/src/iter/adapters/filter.rs b/library/core/src/iter/adapters/filter.rs index 4de520eaca32d..f8d684fcdda46 100644 --- a/library/core/src/iter/adapters/filter.rs +++ b/library/core/src/iter/adapters/filter.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}, - ops::Try, -}; +use crate::fmt; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}; +use crate::ops::Try; /// An iterator that filters the elements of `iter` with `predicate`. /// diff --git a/library/core/src/iter/adapters/filter_map.rs b/library/core/src/iter/adapters/filter_map.rs index c7c63db3cdc71..0dccf2c533b57 100644 --- a/library/core/src/iter/adapters/filter_map.rs +++ b/library/core/src/iter/adapters/filter_map.rs @@ -1,9 +1,6 @@ -use crate::{ - fmt, - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}, - ops::ControlFlow, - ops::Try, -}; +use crate::fmt; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}; +use crate::ops::{ControlFlow, Try}; /// An iterator that uses `f` to both filter and map elements from `iter`. /// diff --git a/library/core/src/iter/adapters/flatten.rs b/library/core/src/iter/adapters/flatten.rs index d38b648cd161b..ff85e114dc982 100644 --- a/library/core/src/iter/adapters/flatten.rs +++ b/library/core/src/iter/adapters/flatten.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{DoubleEndedIterator, Fuse, FusedIterator, Iterator, Map}, - ops::Try, -}; +use crate::fmt; +use crate::iter::{DoubleEndedIterator, Fuse, FusedIterator, Iterator, Map}; +use crate::ops::Try; /// An iterator that maps each element to an iterator, and yields the elements /// of the produced iterators. diff --git a/library/core/src/iter/adapters/fuse.rs b/library/core/src/iter/adapters/fuse.rs index c159e67773b07..ae07406531593 100644 --- a/library/core/src/iter/adapters/fuse.rs +++ b/library/core/src/iter/adapters/fuse.rs @@ -1,11 +1,7 @@ -use crate::{ - intrinsics, - iter::{ - adapters::{zip::try_get_unchecked, InPlaceIterable, SourceIter}, - DoubleEndedIterator, ExactSizeIterator, FusedIterator, Iterator, TrustedRandomAccess, - }, - ops::Try, -}; +use crate::intrinsics; +use crate::iter::adapters::{zip::try_get_unchecked, InPlaceIterable, SourceIter}; +use crate::iter::{DoubleEndedIterator, ExactSizeIterator, FusedIterator, TrustedRandomAccess}; +use crate::ops::Try; /// An iterator that yields `None` forever after the underlying iterator /// yields `None` once. diff --git a/library/core/src/iter/adapters/inspect.rs b/library/core/src/iter/adapters/inspect.rs index ae2e5eac72861..88f5ee61b6b73 100644 --- a/library/core/src/iter/adapters/inspect.rs +++ b/library/core/src/iter/adapters/inspect.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}, - ops::Try, -}; +use crate::fmt; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}; +use crate::ops::Try; /// An iterator that calls a function with a reference to each element before /// yielding it. diff --git a/library/core/src/iter/adapters/map.rs b/library/core/src/iter/adapters/map.rs index 0691f997f7b16..12673806ec40d 100644 --- a/library/core/src/iter/adapters/map.rs +++ b/library/core/src/iter/adapters/map.rs @@ -1,11 +1,7 @@ -use crate::{ - fmt, - iter::{ - adapters::{zip::try_get_unchecked, SourceIter, TrustedRandomAccess}, - FusedIterator, InPlaceIterable, TrustedLen, - }, - ops::Try, -}; +use crate::fmt; +use crate::iter::adapters::{zip::try_get_unchecked, SourceIter, TrustedRandomAccess}; +use crate::iter::{FusedIterator, InPlaceIterable, TrustedLen}; +use crate::ops::Try; /// An iterator that maps the values of `iter` with `f`. /// diff --git a/library/core/src/iter/adapters/map_while.rs b/library/core/src/iter/adapters/map_while.rs index a3dcbb4d82f7f..26114d5328498 100644 --- a/library/core/src/iter/adapters/map_while.rs +++ b/library/core/src/iter/adapters/map_while.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{adapters::SourceIter, InPlaceIterable}, - ops::{ControlFlow, Try}, -}; +use crate::fmt; +use crate::iter::{adapters::SourceIter, InPlaceIterable}; +use crate::ops::{ControlFlow, Try}; /// An iterator that only accepts elements while `predicate` returns `Some(_)`. /// diff --git a/library/core/src/iter/adapters/mod.rs b/library/core/src/iter/adapters/mod.rs index 1969d35fec444..5ef5717085e4f 100644 --- a/library/core/src/iter/adapters/mod.rs +++ b/library/core/src/iter/adapters/mod.rs @@ -1,7 +1,5 @@ -use crate::{ - iter::{InPlaceIterable, Iterator}, - ops::{ControlFlow, Try}, -}; +use crate::iter::{InPlaceIterable, Iterator}; +use crate::ops::{ControlFlow, Try}; mod chain; mod cloned; diff --git a/library/core/src/iter/adapters/peekable.rs b/library/core/src/iter/adapters/peekable.rs index 1822e10bdf675..e7fb3abc94265 100644 --- a/library/core/src/iter/adapters/peekable.rs +++ b/library/core/src/iter/adapters/peekable.rs @@ -1,7 +1,5 @@ -use crate::{ - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable, TrustedLen}, - ops::Try, -}; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable, TrustedLen}; +use crate::ops::Try; /// An iterator with a `peek()` that returns an optional reference to the next /// element. diff --git a/library/core/src/iter/adapters/rev.rs b/library/core/src/iter/adapters/rev.rs index 48ec0a80ad966..105ed40a3ed11 100644 --- a/library/core/src/iter/adapters/rev.rs +++ b/library/core/src/iter/adapters/rev.rs @@ -1,7 +1,5 @@ -use crate::{ - iter::{FusedIterator, TrustedLen}, - ops::Try, -}; +use crate::iter::{FusedIterator, TrustedLen}; +use crate::ops::Try; /// A double-ended iterator with the direction inverted. /// diff --git a/library/core/src/iter/adapters/scan.rs b/library/core/src/iter/adapters/scan.rs index 12c11419c70fd..0214899295e35 100644 --- a/library/core/src/iter/adapters/scan.rs +++ b/library/core/src/iter/adapters/scan.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{adapters::SourceIter, InPlaceIterable}, - ops::{ControlFlow, Try}, -}; +use crate::fmt; +use crate::iter::{adapters::SourceIter, InPlaceIterable}; +use crate::ops::{ControlFlow, Try}; /// An iterator to maintain state while iterating another iterator. /// diff --git a/library/core/src/iter/adapters/skip.rs b/library/core/src/iter/adapters/skip.rs index ff2d07c0c0d5a..dd5325660c342 100644 --- a/library/core/src/iter/adapters/skip.rs +++ b/library/core/src/iter/adapters/skip.rs @@ -1,7 +1,5 @@ -use crate::{ - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}, - ops::{ControlFlow, Try}, -}; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}; +use crate::ops::{ControlFlow, Try}; /// An iterator that skips over `n` elements of `iter`. /// diff --git a/library/core/src/iter/adapters/skip_while.rs b/library/core/src/iter/adapters/skip_while.rs index cda8f9188d215..efcb469fc9577 100644 --- a/library/core/src/iter/adapters/skip_while.rs +++ b/library/core/src/iter/adapters/skip_while.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}, - ops::Try, -}; +use crate::fmt; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}; +use crate::ops::Try; /// An iterator that rejects elements while `predicate` returns `true`. /// diff --git a/library/core/src/iter/adapters/take.rs b/library/core/src/iter/adapters/take.rs index b9a8c7ff2bcc5..9efc7a480aeb4 100644 --- a/library/core/src/iter/adapters/take.rs +++ b/library/core/src/iter/adapters/take.rs @@ -1,8 +1,6 @@ -use crate::{ - cmp, - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable, TrustedLen}, - ops::{ControlFlow, Try}, -}; +use crate::cmp; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable, TrustedLen}; +use crate::ops::{ControlFlow, Try}; /// An iterator that only iterates over the first `n` iterations of `iter`. /// diff --git a/library/core/src/iter/adapters/take_while.rs b/library/core/src/iter/adapters/take_while.rs index aae0b20b83c4a..746eb41f4c387 100644 --- a/library/core/src/iter/adapters/take_while.rs +++ b/library/core/src/iter/adapters/take_while.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}, - ops::{ControlFlow, Try}, -}; +use crate::fmt; +use crate::iter::{adapters::SourceIter, FusedIterator, InPlaceIterable}; +use crate::ops::{ControlFlow, Try}; /// An iterator that only accepts elements while `predicate` returns `true`. /// diff --git a/library/core/src/iter/adapters/zip.rs b/library/core/src/iter/adapters/zip.rs index fdc4035a612f1..8cd4c77523192 100644 --- a/library/core/src/iter/adapters/zip.rs +++ b/library/core/src/iter/adapters/zip.rs @@ -1,11 +1,7 @@ -use crate::{ - cmp, - fmt::{self, Debug}, - iter::{ - DoubleEndedIterator, ExactSizeIterator, FusedIterator, InPlaceIterable, Iterator, - SourceIter, TrustedLen, - }, -}; +use crate::cmp; +use crate::fmt::{self, Debug}; +use crate::iter::{DoubleEndedIterator, ExactSizeIterator, FusedIterator, Iterator}; +use crate::iter::{InPlaceIterable, SourceIter, TrustedLen}; /// An iterator that iterates two other iterators simultaneously. /// diff --git a/library/core/src/iter/sources/empty.rs b/library/core/src/iter/sources/empty.rs index 45412754a11ba..5d4a9fe8c6cc0 100644 --- a/library/core/src/iter/sources/empty.rs +++ b/library/core/src/iter/sources/empty.rs @@ -1,8 +1,6 @@ -use crate::{ - fmt, - iter::{FusedIterator, TrustedLen}, - marker, -}; +use crate::fmt; +use crate::iter::{FusedIterator, TrustedLen}; +use crate::marker; /// Creates an iterator that yields nothing. ///